From: Sébastien Han <seb@redhat.com>
Date: Mon, 28 Aug 2017 22:16:31 +0000 (+0200)
Subject: ceph-docker-common: fix empty array
X-Git-Tag: v3.0.0rc4~2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1825%2Fhead;p=ceph-ansible.git

ceph-docker-common: fix empty array

The list can not be evaluated properly if it containers '[]', which is
the case when using the filter "default([])". To fix this, we have to
properly merge the lists.

This is fixing the issue: "list object has no element 1"

Signed-off-by: Sébastien Han <seb@redhat.com>
---

diff --git a/roles/ceph-docker-common/tasks/fetch_configs.yml b/roles/ceph-docker-common/tasks/fetch_configs.yml
index 03fa62ed0..d36178274 100644
--- a/roles/ceph-docker-common/tasks/fetch_configs.yml
+++ b/roles/ceph-docker-common/tasks/fetch_configs.yml
@@ -1,9 +1,4 @@
 ---
-- name: register rbd bootstrap key
-  set_fact:
-    bootstrap_rbd_keyring: "/var/lib/ceph/bootstrap-rbd/{{ cluster }}.keyring"
-  when: ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous
-
 - name: set config and keys paths
   set_fact:
     ceph_config_keys:
@@ -13,7 +8,17 @@
       - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
       - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
       - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
-      - "{{ bootstrap_rbd_keyring | default([]) }}"
+
+- name: register rbd bootstrap key
+  set_fact:
+    bootstrap_rbd_keyring:
+      - "/var/lib/ceph/bootstrap-rbd/{{ cluster }}.keyring"
+  when: ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous
+
+- name: merge rbd bootstrap key to config and keys paths
+  set_fact:
+    ceph_config_keys: "{{ ceph_config_keys + bootstrap_rbd_keyring }}"
+  when: ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous
 
 - name: add mgr keys to config and keys paths
   set_fact: