Use ansible_fqdn when copying keys to OSDs

diff --git a/roles/osd/tasks/journal_collocation.yml b/roles/osd/tasks/journal_collocation.yml
index 4a3d3585779da98152049084ac63742552b46cbe..19e9c007137c4dbf17010b37718672f82d1c7ddb 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_hostname'] }}/var/lib/ceph/bootstrap-osd/ceph.keyring dest=/var/lib/ceph/bootstrap-osd/ceph.keyring owner=root group=root mode=600
+  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
   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 99180a069aba083b094d979e24c3c76f800a2843..0aa663530e6af4129fa21e795c445628caecfa82 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_hostname'] }}/var/lib/ceph/bootstrap-osd/ceph.keyring dest=/var/lib/ceph/bootstrap-osd/ceph.keyring owner=root group=root mode=600
+  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
   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 414a69f98ab107e20149064a694e37b699d38340..ee5506799fe7d39d472bede3f2ef058b0d561b29 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_hostname'] }}/var/lib/ceph/bootstrap-osd/ceph.keyring dest=/var/lib/ceph/bootstrap-osd/ceph.keyring owner=root group=root mode=600
+  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
   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"