summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-04-21 14:01:12 -0500
committerGitHub <noreply@github.com>2017-04-21 14:01:12 -0500
commit67eb7f6ed3509c8f9cd26e6f6e9e17789cb7d2a4 (patch)
tree0bdf3e333f0c9686b0bc7b3ce2c4df7e58f321df
parentb92f95193b59bf3e3923d1dc170f75cc13e045be (diff)
parentcdca97312294bfff6effeda17df2fa7a9b0f0522 (diff)
downloadopenshift-67eb7f6ed3509c8f9cd26e6f6e9e17789cb7d2a4.tar.gz
openshift-67eb7f6ed3509c8f9cd26e6f6e9e17789cb7d2a4.tar.bz2
openshift-67eb7f6ed3509c8f9cd26e6f6e9e17789cb7d2a4.tar.xz
openshift-67eb7f6ed3509c8f9cd26e6f6e9e17789cb7d2a4.zip
Merge pull request #3945 from jarrpa/glusterfs-fix-gce
Merged by openshift-bot
-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