From e1a1f81b6fdab41ac051cbf5f29eb101df3b50da Mon Sep 17 00:00:00 2001
From: vasishta p shastry <vipin.indiasmg@gmail.com>
Date: Tue, 10 Apr 2018 18:51:50 +0530
Subject: [PATCH] osd: to support copy_admin_key

---
 roles/ceph-osd/tasks/copy_configs.yml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/roles/ceph-osd/tasks/copy_configs.yml b/roles/ceph-osd/tasks/copy_configs.yml
index 71af13065..8d2a82fe1 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