summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose A. Rivera <jarrpa@redhat.com>2017-06-16 11:19:44 -0500
committerJose A. Rivera <jarrpa@redhat.com>2017-06-16 17:31:46 -0500
commit08dd5120fce0238a579154542655452208f37311 (patch)
tree6b1d27058e455a7cb84527718770f86f656b6bc6
parentdb2c93950bb9327afab3be70f087010751792977 (diff)
downloadopenshift-08dd5120fce0238a579154542655452208f37311.tar.gz
openshift-08dd5120fce0238a579154542655452208f37311.tar.bz2
openshift-08dd5120fce0238a579154542655452208f37311.tar.xz
openshift-08dd5120fce0238a579154542655452208f37311.zip
GlusterFS: Fix error when groups.glusterfs_registry is undefined.
Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
-rw-r--r--roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml b/roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml
index 3291d8bb2..0849f2a2e 100644
--- a/roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml
+++ b/roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml
@@ -20,12 +20,12 @@
glusterfs_heketi_wipe: "{{ openshift_storage_glusterfs_registry_heketi_wipe }}"
glusterfs_heketi_url: "{{ openshift_storage_glusterfs_registry_heketi_url }}"
glusterfs_heketi_port: "{{ openshift_storage_glusterfs_registry_heketi_port }}"
- glusterfs_nodes: "{{ groups.glusterfs_registry }}"
+ glusterfs_nodes: "{{ groups.glusterfs_registry | default(groups.glusterfs) }}"
- include: glusterfs_common.yml
when:
- - groups.glusterfs_registry | default([]) | count > 0
- - "'glusterfs' not in groups or groups.glusterfs_registry != groups.glusterfs"
+ - glusterfs_nodes | default([]) | count > 0
+ - "'glusterfs' not in groups or glusterfs_nodes != groups.glusterfs"
- name: Delete pre-existing GlusterFS registry resources
oc_obj: