osd: to support copy_admin_key

(cherry picked from commit e1a1f81b6fdab41ac051cbf5f29eb101df3b50da)
Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/roles/ceph-osd/tasks/copy_configs.yml b/roles/ceph-osd/tasks/copy_configs.yml
index f3f438a04c6815d5a5243b1890e05c6df81481e4..c141118ade6e1fb2b029ae58a2f181f31678462f 100644 (file)
--- a/roles/ceph-osd/tasks/copy_configs.yml
+++ b/roles/ceph-osd/tasks/copy_configs.yml
@@ -1,9 +1,22 @@
 ---
-- name: set config and keys paths
+- name: set_fact admin_keyring
+  set_fact:
+    admin_keyring:
+      - "/etc/ceph/{{ cluster }}.client.admin.keyring"
+  when:
+    - copy_admin_key
+
+- name: set_fact ceph_config_keys
   set_fact:
     ceph_config_keys:
       - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
 
+- name: merge ceph_config_keys and admin_keyring
+  set_fact:
+    ceph_config_keys: "{{ ceph_config_keys + admin_keyring }}"
+  when:
+    - copy_admin_key
+
 - name: wait for ceph.conf and keys
   local_action:
     module: wait_for