From: Guillaume Abrioux Date: Tue, 19 Sep 2017 09:38:13 +0000 (+0200) Subject: docker-common: refact `stat_ceph_files.yml` X-Git-Tag: v3.0.0rc11~11^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1886a69b8bb8f2909b24457c1200ccb95c423c6a;p=ceph-ansible.git docker-common: refact `stat_ceph_files.yml` there is no need to build the `ceph_config_keys` fact in several steps for rbd-mirror keyring. Signed-off-by: Guillaume Abrioux --- diff --git a/roles/ceph-docker-common/tasks/stat_ceph_files.yml b/roles/ceph-docker-common/tasks/stat_ceph_files.yml index a94056491..ffd50b57f 100644 --- a/roles/ceph-docker-common/tasks/stat_ceph_files.yml +++ b/roles/ceph-docker-common/tasks/stat_ceph_files.yml @@ -8,17 +8,7 @@ - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring - -- name: set_fact bootstrap_rbd_keyring - set_fact: - bootstrap_rbd_keyring: - - "/var/lib/ceph/bootstrap-rbd/{{ cluster }}.keyring" - when: ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous - -- name: set_fact ceph_config_keys ceph_config_keys + bootstrap_rbd_keyring - set_fact: - ceph_config_keys: "{{ ceph_config_keys + bootstrap_rbd_keyring }}" - when: ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous + - /var/lib/ceph/bootstrap-rbd/{{ cluster }}.keyring - name: set_fact tmp_ceph_mgr_keys add mgr keys to config and keys paths set_fact: