infra: Fix ceph.conf creation when taking over existing cluster

Fixes bug introduced in https://github.com/ceph/ceph-ansible/pull/1330

The "stat ceph.conf" task was basically using the stat module on a
string instead of the ceph.conf filename.  This caused the "generate
ceph configuration file" task to fail.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1463382
Signed-off-by: David Galloway <dgallowa@redhat.com>

diff --git a/infrastructure-playbooks/take-over-existing-cluster.yml b/infrastructure-playbooks/take-over-existing-cluster.yml
index 1e3df76972cceb86ac56d43619071ca5245a2908..1443b91821d3829c6fdef377ef87faa8c77a930b 100644 (file)
--- a/infrastructure-playbooks/take-over-existing-cluster.yml
+++ b/infrastructure-playbooks/take-over-existing-cluster.yml
@@ -30,18 +30,18 @@
       shell: |
         basename $(grep -R fsid /etc/ceph/ | egrep -o '^[^.]*')
       changed_when: false
-      register: ceph_conf
+      register: cluster_name
 
-    - name: stat ceph.conf
+    - name: "stat {{ cluster_name.stdout }}.conf"
       stat:
-        path: "{{ ceph_conf.stdout }}"
+        path: "/etc/ceph/{{ cluster_name.stdout }}.conf"
       register: ceph_conf_stat
 
     - name: generate ceph configuration file
       action: config_template
       args:
         src: "roles/ceph-common/templates/ceph.conf.j2"
-        dest: "{{ ceph_conf.stdout }}"
+        dest: "/etc/ceph/{{ cluster_name.stdout }}.conf"
         owner: "{{ ceph_conf_stat.stat.pw_name }}"
         group: "{{ ceph_conf_stat.stat.gr_name }}"
         mode: "{{ ceph_conf_stat.stat.mode }}"