Merge pull request #1014 from 9seconds/cluster_name_for_ceph_fetch_keys

Allow to propagate cluster name to ceph-fetch-keys
2016-10-07 15:53:39 +02:00 · 2016-10-07 15:53:39 +02:00 · 05a9e68a40
parent 2598e4639f f7452f11f9
commit 05a9e68a40
3 changed files with 5 additions and 3 deletions
--- a/group_vars/ceph-fetch-keys.sample
+++ b/group_vars/ceph-fetch-keys.sample
@ -9,4 +9,5 @@ dummy:


 #fetch_directory: fetch/
+#cluster: ceph

--- 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
--- 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"