Allow to propagate cluster name to ceph-fetch-keys

ceph-fetch-keys role currently works only if cluster name is 'ceph'.
This commit allows to set custom cluster name in 'defaults' in the same
fashion as other roles do.

diff --git a/roles/ceph-fetch-keys/defaults/main.yml b/roles/ceph-fetch-keys/defaults/main.yml
index aae9a53517b2f195980fdaa4eb99315e1e040929..c69b2b79552c8b93b953e1af7790a11541c814d0 100644 (file)
--- a/roles/ceph-fetch-keys/defaults/main.yml
+++ b/roles/ceph-fetch-keys/defaults/main.yml
@@ -1,3 +1,4 @@
 ---
 
 fetch_directory: fetch/
+cluster: ceph

diff --git a/roles/ceph-fetch-keys/tasks/main.yml b/roles/ceph-fetch-keys/tasks/main.yml
index c6da11e724cf0af7545473ff3632094a0f36a2d9..2fb02ded7e394cf0db9fe9c82c2c202174950fab 100644 (file)
--- a/roles/ceph-fetch-keys/tasks/main.yml
+++ b/roles/ceph-fetch-keys/tasks/main.yml
@@ -21,6 +21,6 @@
   run_once: true
   with_items:
     - "{{ ceph_keys.stdout_lines }}"
-    - /var/lib/ceph/bootstrap-osd/ceph.keyring
-    - /var/lib/ceph/bootstrap-rgw/ceph.keyring
-    - /var/lib/ceph/bootstrap-mds/ceph.keyring
+    - "/var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring"
+    - "/var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring"
+    - "/var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring"