From: vasishta p shastry <vipin.indiasmg@gmail.com>
Date: Tue, 10 Apr 2018 12:39:43 +0000 (+0530)
Subject: mds: to support copy_admin_keyring
X-Git-Tag: v3.1.0beta6~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=db3a5ce6d917e399236163f7de097f1b40a9a26c;p=ceph-ansible.git

mds: to support copy_admin_keyring
---

diff --git a/roles/ceph-mds/tasks/containerized.yml b/roles/ceph-mds/tasks/containerized.yml
index f11e959e9..8bc54c2d3 100644
--- a/roles/ceph-mds/tasks/containerized.yml
+++ b/roles/ceph-mds/tasks/containerized.yml
@@ -3,11 +3,24 @@
   set_fact:
     docker_exec_cmd: "docker exec ceph-mds-{{ ansible_hostname }}"
 
+- 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-mds/{{ 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: stat for ceph config and keys
   local_action:
     module: stat