From 01844692294060dc1b7f0197b195c70aaa0dca67 Mon Sep 17 00:00:00 2001 From: 9seconds Date: Fri, 7 Oct 2016 09:06:21 +0300 Subject: [PATCH] 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. --- roles/ceph-fetch-keys/defaults/main.yml | 1 + roles/ceph-fetch-keys/tasks/main.yml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/roles/ceph-fetch-keys/defaults/main.yml b/roles/ceph-fetch-keys/defaults/main.yml index aae9a5351..c69b2b795 100644 --- 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 c6da11e72..2fb02ded7 100644 --- 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"