From: vasishta p shastry <vipin.indiasmg@gmail.com>
Date: Tue, 10 Apr 2018 13:21:50 +0000 (+0530)
Subject: osd: to support copy_admin_key
X-Git-Tag: v3.0.31~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=43f4a3b68f0a9aa4c9c6063664a0112a362d98e3;p=ceph-ansible.git

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 f3f438a04..c141118ad 100644
--- 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