summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorLénaïc Huard <lhuard@amadeus.com>2017-04-19 07:45:39 +0200
committerLénaïc Huard <lhuard@amadeus.com>2017-04-19 07:45:39 +0200
commit5ab7826e430f6368f35b42ad62d399493bc9814a (patch)
tree99a32b41645d217ee03c2db78f094b6893ac5600 /roles
parent233cb72777a5bdea68e5a7703bad53bb012c0bd0 (diff)
downloadopenshift-5ab7826e430f6368f35b42ad62d399493bc9814a.tar.gz
openshift-5ab7826e430f6368f35b42ad62d399493bc9814a.tar.bz2
openshift-5ab7826e430f6368f35b42ad62d399493bc9814a.tar.xz
openshift-5ab7826e430f6368f35b42ad62d399493bc9814a.zip
Fix cluster creation with `bin/cluster` when there’s no glusterfs node
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_storage_glusterfs/tasks/glusterfs_deploy.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_storage_glusterfs/tasks/glusterfs_deploy.yml b/roles/openshift_storage_glusterfs/tasks/glusterfs_deploy.yml
index 26ca5eebf..2b35e5137 100644
--- a/roles/openshift_storage_glusterfs/tasks/glusterfs_deploy.yml
+++ b/roles/openshift_storage_glusterfs/tasks/glusterfs_deploy.yml
@@ -29,14 +29,14 @@
path: /var/lib/glusterd
state: absent
delegate_to: "{{ item }}"
- with_items: "{{ groups.oo_glusterfs_to_config }}"
+ with_items: "{{ groups.oo_glusterfs_to_config | default([]) }}"
when: openshift_storage_glusterfs_wipe
- name: Get GlusterFS storage devices state
command: "pvdisplay -C --noheadings -o pv_name,vg_name {% for device in hostvars[item].glusterfs_devices %}{{ device }} {% endfor %}"
register: devices_info
delegate_to: "{{ item }}"
- with_items: "{{ groups.oo_glusterfs_to_config }}"
+ with_items: "{{ groups.oo_glusterfs_to_config | default([]) }}"
failed_when: False
when: openshift_storage_glusterfs_wipe
@@ -65,7 +65,7 @@
kind: node
state: add
labels: "{{ openshift_storage_glusterfs_nodeselector | oo_dict_to_list_of_dict }}"
- with_items: "{{ groups.oo_glusterfs_to_config }}"
+ with_items: "{{ groups.oo_glusterfs_to_config | default([]) }}"
loop_control:
loop_var: glusterfs_host