]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
rbd-mirror: Allow to copy the admin keyring
authorDimitri Savineau <dsavinea@redhat.com>
Mon, 9 Sep 2019 18:33:55 +0000 (14:33 -0400)
committerDimitri Savineau <savineau.dimitri@gmail.com>
Tue, 10 Sep 2019 20:38:48 +0000 (16:38 -0400)
The ceph-rbd-mirror role allows to copy the admin keyring via the
copy_admin_key variable but there's actually no task in that role
doing the job.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 1f505628dd5e62226ceee975679f1629788771f9)

roles/ceph-rbd-mirror/tasks/common.yml

index 3750e2d06a7b31c1f3503a2f5f7fbce996d83406..2e28806ddf131141456f8649132a818da5fe4cfe 100644 (file)
@@ -7,4 +7,15 @@
     group: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
     mode: "{{ ceph_keyring_permissions }}"
   when:
-    - cephx
\ No newline at end of file
+    - cephx
+
+- name: copy ceph admin keyring if needed
+  copy:
+    src: "{{ fetch_directory }}/{{ fsid }}/etc/ceph/{{ cluster }}.client.admin.keyring"
+    dest: "/etc/ceph/{{ cluster }}.client.admin.keyring"
+    owner: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
+    group: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
+    mode: "{{ ceph_keyring_permissions }}"
+  when:
+    - cephx | bool
+    - copy_admin_key | bool