]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
rgw: ability to copy ceph admin key on containerized
authorSébastien Han <seb@redhat.com>
Thu, 1 Mar 2018 15:47:22 +0000 (16:47 +0100)
committerGuillaume Abrioux <gabrioux@redhat.com>
Fri, 2 Mar 2018 20:59:10 +0000 (20:59 +0000)
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 <seb@redhat.com>
roles/ceph-rgw/tasks/docker/copy_configs.yml

index c22e24d49205c70f2b8e952f5de6ce01b46819f1..ed35f62af6f662efe9711f29f439d0f22cf416dd 100644 (file)
@@ -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