From 9c85280602142fa1fb60c6f15c6d0c9e8c62d401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Thu, 1 Mar 2018 16:47:22 +0100 Subject: [PATCH] rgw: ability to copy ceph admin key on containerized MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If we now set copy_admin_key while running a containerized scenario, the ceph admin key will be copied on the node. Signed-off-by: Sébastien Han --- roles/ceph-rgw/tasks/docker/copy_configs.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/roles/ceph-rgw/tasks/docker/copy_configs.yml b/roles/ceph-rgw/tasks/docker/copy_configs.yml index c22e24d49..ed35f62af 100644 --- a/roles/ceph-rgw/tasks/docker/copy_configs.yml +++ b/roles/ceph-rgw/tasks/docker/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-rgw/{{ 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