Merge pull request #76 from AcalephStorage/fetch-fsid

Removed dependency on mon[0]

roles/mds/tasks/main.yml

@@ -3,7 +3,7 @@
 #
 
 - name: Copy MDS bootstrap key
-  copy: src=fetch/{{ hostvars[groups['mons'][0]]['ansible_fqdn'] }}/var/lib/ceph/bootstrap-mds/ceph.keyring dest=/var/lib/ceph/bootstrap-mds/ceph.keyring owner=root group=root mode=600
+  copy: src=fetch/{{ fsid }}/var/lib/ceph/bootstrap-mds/ceph.keyring dest=/var/lib/ceph/bootstrap-mds/ceph.keyring owner=root group=root mode=600
   when: cephx
 
 - name: Create MDS directory

roles/mon/tasks/main.yml

@@ -33,8 +33,8 @@
   changed_when: False
 
 - name: Copy keys to the ansible server
-  fetch: src={{ item }} dest=fetch/
-  when: ansible_fqdn == hostvars[groups['mons'][0]]['ansible_fqdn'] and cephx
+  fetch: src={{ item }} dest=fetch/{{ fsid }}/{{ item }} flat=yes
+  when: cephx
   with_items:
     - /etc/ceph/ceph.client.admin.keyring # just in case another application needs it
     - /var/lib/ceph/bootstrap-osd/ceph.keyring # this handles the non-colocation case

roles/osd/tasks/journal_collocation.yml

@@ -11,7 +11,7 @@
   when: ansible_os_family == 'RedHat'
 
 - name: Copy OSD bootstrap key
-  copy: src=fetch/{{ hostvars[groups['mons'][0]]['ansible_fqdn'] }}/var/lib/ceph/bootstrap-osd/ceph.keyring dest=/var/lib/ceph/bootstrap-osd/ceph.keyring owner=root group=root mode=600
+  copy: src=fetch/{{ fsid }}/var/lib/ceph/bootstrap-osd/ceph.keyring dest=/var/lib/ceph/bootstrap-osd/ceph.keyring owner=root group=root mode=600
   when: cephx
 
 # NOTE (leseb): current behavior of ceph-disk is to fail when the device is mounted "stderr: ceph-disk: Error: Device is mounted: /dev/sdb1"

roles/osd/tasks/raw_journal.yml

@@ -11,7 +11,7 @@
   when: ansible_os_family == 'RedHat'
 
 - name: Copy OSD bootstrap key
-  copy: src=fetch/{{ hostvars[groups['mons'][0]]['ansible_fqdn'] }}/var/lib/ceph/bootstrap-osd/ceph.keyring dest=/var/lib/ceph/bootstrap-osd/ceph.keyring owner=root group=root mode=600
+  copy: src=fetch/{{ fsid }}/var/lib/ceph/bootstrap-osd/ceph.keyring dest=/var/lib/ceph/bootstrap-osd/ceph.keyring owner=root group=root mode=600
   when: cephx
 
 # NOTE (leseb): current behavior of ceph-disk is to fail when the device is mounted "stderr: ceph-disk: Error: Device is mounted: /dev/sdb1"

roles/osd/tasks/raw_multi_journal.yml

@@ -11,7 +11,7 @@
   when: ansible_os_family == 'RedHat'
 
 - name: Copy OSD bootstrap key
-  copy: src=fetch/{{ hostvars[groups['mons'][0]]['ansible_fqdn'] }}/var/lib/ceph/bootstrap-osd/ceph.keyring dest=/var/lib/ceph/bootstrap-osd/ceph.keyring owner=root group=root mode=600
+  copy: src=fetch/{{ fsid }}/var/lib/ceph/bootstrap-osd/ceph.keyring dest=/var/lib/ceph/bootstrap-osd/ceph.keyring owner=root group=root mode=600
   when: cephx
 
 # NOTE (leseb): current behavior of ceph-disk is to fail when the device is mounted "stderr: ceph-disk: Error: Device is mounted: /dev/sdb1"

roles/radosgw/tasks/Debian.yml

@@ -3,7 +3,7 @@
 #
 
 - name: Copy RGW bootstrap key
-  copy: src=fetch/{{ hostvars[groups['mons'][0]]['ansible_fqdn'] }}/etc/ceph/keyring.radosgw.gateway dest=/etc/ceph/keyring.radosgw.gateway owner=root group=root mode=600
+  copy: src=fetch/{{ fsid }}/etc/ceph/keyring.radosgw.gateway dest=/etc/ceph/keyring.radosgw.gateway owner=root group=root mode=600
   when: cephx
 
 - name: Set RGW bootstrap key permissions

roles/radosgw/tasks/RedHat.yml

@@ -3,7 +3,7 @@
 #
 
 - name: Copy RGW bootstrap key
-  copy: src=fetch/{{ hostvars[groups['mons'][0]]['ansible_fqdn'] }}/etc/ceph/keyring.radosgw.gateway dest=/etc/ceph/keyring.radosgw.gateway owner=root group=root mode=600
+  copy: src=fetch/{{ fsid }}/etc/ceph/keyring.radosgw.gateway dest=/etc/ceph/keyring.radosgw.gateway owner=root group=root mode=600
   when: cephx
 
 - name: Set RGW bootstrap key permissions