From 26cd62b4e6d5c2edc567d499b0c2cb40742e88ae Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Thu, 8 Nov 2018 14:33:29 +0100 Subject: [PATCH] Revert "rbd-mirror: use the new rbd-mirror key" This reverts commit cdee9f01194eff27e6b6bf66ab436cecdd482dcb. --- roles/ceph-mon/tasks/docker/copy_configs.yml | 1 - roles/ceph-rbd-mirror/tasks/common.yml | 4 ++-- roles/ceph-rbd-mirror/tasks/pre_requisite.yml | 8 +------- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/roles/ceph-mon/tasks/docker/copy_configs.yml b/roles/ceph-mon/tasks/docker/copy_configs.yml index f5a5fa917..304d04371 100644 --- a/roles/ceph-mon/tasks/docker/copy_configs.yml +++ b/roles/ceph-mon/tasks/docker/copy_configs.yml @@ -8,7 +8,6 @@ - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring - /var/lib/ceph/bootstrap-rbd/{{ cluster }}.keyring - - /var/lib/ceph/bootstrap-rbd-mirror/{{ cluster }}.keyring - name: stat for ceph config and keys stat: diff --git a/roles/ceph-rbd-mirror/tasks/common.yml b/roles/ceph-rbd-mirror/tasks/common.yml index ca168ab19..3750e2d06 100644 --- a/roles/ceph-rbd-mirror/tasks/common.yml +++ b/roles/ceph-rbd-mirror/tasks/common.yml @@ -1,8 +1,8 @@ --- - name: copy rbd-mirror bootstrap key copy: - src: "{{ fetch_directory }}/{{ fsid }}/var/lib/ceph/bootstrap-rbd-mirror/{{ cluster }}.keyring" - dest: "/var/lib/ceph/bootstrap-rbd-mirror/{{ cluster }}.keyring" + src: "{{ fetch_directory }}/{{ fsid }}/var/lib/ceph/bootstrap-rbd/{{ cluster }}.keyring" + dest: "/var/lib/ceph/bootstrap-rbd/{{ cluster }}.keyring" owner: "{{ ceph_uid if containerized_deployment else 'ceph' }}" group: "{{ ceph_uid if containerized_deployment else 'ceph' }}" mode: "{{ ceph_keyring_permissions }}" diff --git a/roles/ceph-rbd-mirror/tasks/pre_requisite.yml b/roles/ceph-rbd-mirror/tasks/pre_requisite.yml index 5a0486a72..29f917b89 100644 --- a/roles/ceph-rbd-mirror/tasks/pre_requisite.yml +++ b/roles/ceph-rbd-mirror/tasks/pre_requisite.yml @@ -9,13 +9,7 @@ - package-install - name: create rbd-mirror keyring - command: > - ceph --cluster {{ cluster }} - --name client.bootstrap-rbd-mirror - --keyring /var/lib/ceph/bootstrap-rbd-mirror/{{ 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 + 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: creates: /etc/ceph/{{ cluster }}.client.rbd-mirror.{{ ansible_hostname }}.keyring changed_when: false -- 2.47.3