Avoid ip/fqdn weirdness & use fsid path for keys

diff --git a/roles/mds/tasks/main.yml b/roles/mds/tasks/main.yml
index 0849ebec33ffa9a30aa4befea784ac48dca11880..1b08d8eb749e51db5f8b95899a7a8b994fdaed65 100644 (file)
--- a/roles/mds/tasks/main.yml
+++ b/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

diff --git a/roles/mon/tasks/main.yml b/roles/mon/tasks/main.yml
index 007f4710511f973c2c675825a68dccfdf68ec091..bf2255435979ddf0de51f6ea7a52caebcaf937ba 100644 (file)
--- a/roles/mon/tasks/main.yml
+++ b/roles/mon/tasks/main.yml
@@ -33,7 +33,7 @@
   changed_when: False
 
 - name: Copy keys to the ansible server
-  fetch: src={{ item }} dest=fetch/
+  fetch: src={{ item }} dest=fetch/{{ fsid }}/{{ item }} flat=yes
   when: ansible_fqdn == hostvars[groups['mons'][0]]['ansible_fqdn'] and cephx
   with_items:
     - /etc/ceph/ceph.client.admin.keyring # just in case another application needs it

diff --git a/roles/osd/tasks/journal_collocation.yml b/roles/osd/tasks/journal_collocation.yml
index 19e9c007137c4dbf17010b37718672f82d1c7ddb..21dee327f5de823d1b5453b07b16bcf1e1453bc4 100644 (file)
--- a/roles/osd/tasks/journal_collocation.yml
+++ b/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"

diff --git a/roles/osd/tasks/raw_journal.yml b/roles/osd/tasks/raw_journal.yml
index 0aa663530e6af4129fa21e795c445628caecfa82..f719ef74c55ca386238fe67342bd18b133456586 100644 (file)
--- a/roles/osd/tasks/raw_journal.yml
+++ b/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"

diff --git a/roles/osd/tasks/raw_multi_journal.yml b/roles/osd/tasks/raw_multi_journal.yml
index ee5506799fe7d39d472bede3f2ef058b0d561b29..aefeb3702fcf2a6202625c65561d2ce24db52f64 100644 (file)
--- a/roles/osd/tasks/raw_multi_journal.yml
+++ b/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"

diff --git a/roles/radosgw/tasks/Debian.yml b/roles/radosgw/tasks/Debian.yml
index aea4277eefa244f6e5e6d0cc5227f2af947f45da..7bc01baeb4feea6befb6f5f4033ecb151ab92d5b 100644 (file)
--- a/roles/radosgw/tasks/Debian.yml
+++ b/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

diff --git a/roles/radosgw/tasks/RedHat.yml b/roles/radosgw/tasks/RedHat.yml
index 2f759843ad11ba4ed551119fa48261dd28e93924..a2960b543ddf42fa19512a4201d2e01aa8109db3 100644 (file)
--- a/roles/radosgw/tasks/RedHat.yml
+++ b/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