From db3a5ce6d917e399236163f7de097f1b40a9a26c Mon Sep 17 00:00:00 2001 From: vasishta p shastry Date: Tue, 10 Apr 2018 18:09:43 +0530 Subject: [PATCH] mds: to support copy_admin_keyring --- roles/ceph-mds/tasks/containerized.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) 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