From 57831b4083cedfcaf8f8fd29b9db5e9548220248 Mon Sep 17 00:00:00 2001 From: Alessandro Corbelli Date: Wed, 12 Mar 2014 14:46:40 +0100 Subject: [PATCH] Use ansible_fqdn when copying keys to OSDs --- roles/osd/tasks/journal_collocation.yml | 2 +- roles/osd/tasks/raw_journal.yml | 2 +- roles/osd/tasks/raw_multi_journal.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/osd/tasks/journal_collocation.yml b/roles/osd/tasks/journal_collocation.yml index 4a3d35857..19e9c0071 100644 --- 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 99180a069..0aa663530 100644 --- 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 414a69f98..ee5506799 100644 --- 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" -- 2.47.3