]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
docker-common: refact `stat_ceph_files.yml`
authorGuillaume Abrioux <gabrioux@redhat.com>
Tue, 19 Sep 2017 09:38:13 +0000 (11:38 +0200)
committerGuillaume Abrioux <gabrioux@redhat.com>
Thu, 21 Sep 2017 07:56:37 +0000 (09:56 +0200)
there is no need to build the `ceph_config_keys` fact in several steps
for rbd-mirror keyring.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
roles/ceph-docker-common/tasks/stat_ceph_files.yml

index a94056491f23e88bf4ddfbade1b15f62f91d8c5a..ffd50b57ff19a6995ea529d50b41a9d83fa47341 100644 (file)
@@ -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: