From 48c1dcd92bfbddd5dd59e54f0fafd4c6cd045d7e Mon Sep 17 00:00:00 2001 From: Hunter Nield Date: Wed, 30 Apr 2014 15:16:11 +0800 Subject: [PATCH] Avoid ip/fqdn weirdness & use fsid path for keys --- roles/mds/tasks/main.yml | 2 +- roles/mon/tasks/main.yml | 2 +- roles/osd/tasks/journal_collocation.yml | 2 +- roles/osd/tasks/raw_journal.yml | 2 +- roles/osd/tasks/raw_multi_journal.yml | 2 +- roles/radosgw/tasks/Debian.yml | 2 +- roles/radosgw/tasks/RedHat.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/roles/mds/tasks/main.yml b/roles/mds/tasks/main.yml index 0849ebec3..1b08d8eb7 100644 --- 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 007f47105..bf2255435 100644 --- 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 19e9c0071..21dee327f 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_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 0aa663530..f719ef74c 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_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 ee5506799..aefeb3702 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_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 aea4277ee..7bc01baeb 100644 --- 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 2f759843a..a2960b543 100644 --- 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 -- 2.39.5