From: Guillaume Abrioux Date: Wed, 25 Jul 2018 21:57:38 +0000 (+0200) Subject: rbd-mirror: bring back compatibility with jewel deployment X-Git-Tag: v3.2.0beta2~97 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1ecbbbdcfa928a3ee7381b0dc2dcf0c460dfb549;p=ceph-ansible.git rbd-mirror: bring back compatibility with jewel deployment rbd-mirror can't start when deploying jewel because it needs admin keyring. Getting back this task brings backward compatibility for jewel deployment. Signed-off-by: Guillaume Abrioux --- diff --git a/roles/ceph-rbd-mirror/tasks/pre_requisite.yml b/roles/ceph-rbd-mirror/tasks/pre_requisite.yml index b7f659d40..ddefb2a50 100644 --- a/roles/ceph-rbd-mirror/tasks/pre_requisite.yml +++ b/roles/ceph-rbd-mirror/tasks/pre_requisite.yml @@ -8,6 +8,17 @@ tags: - package-install +- name: copy ceph admin key + copy: + src: "{{ fetch_directory }}/{{ fsid }}/etc/ceph/{{ cluster }}.client.admin.keyring" + dest: "/etc/ceph/{{ cluster }}.client.admin.keyring" + owner: "{{ ceph_uid }}" + group: "{{ ceph_uid }}" + mode: "0600" + when: + - cephx + - ceph_release_num[ceph_release] < ceph_release_num.luminous + - name: create rbd-mirror keyring command: ceph --cluster {{ cluster }} --name client.bootstrap-rbd --keyring /var/lib/ceph/bootstrap-rbd/{{ cluster }}.keyring auth get-or-create client.rbd-mirror.{{ ansible_hostname }} mon 'profile rbd' osd 'profile rbd' -o /etc/ceph/{{ cluster }}.client.rbd-mirror.{{ ansible_hostname }}.keyring args: