summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose A. Rivera <jarrpa@redhat.com>2017-05-15 15:55:00 -0500
committerJose A. Rivera <jarrpa@redhat.com>2017-06-13 13:10:23 -0500
commit9c06b1e7fc9cdf7a5cc190ce7f683c00b60d97e8 (patch)
treeafa4d7b036eb3505b5f5349c0f63f91fd7f92612
parent0cdd84e54406c41033ad8cec9e88fc425bae572c (diff)
downloadopenshift-9c06b1e7fc9cdf7a5cc190ce7f683c00b60d97e8.tar.gz
openshift-9c06b1e7fc9cdf7a5cc190ce7f683c00b60d97e8.tar.bz2
openshift-9c06b1e7fc9cdf7a5cc190ce7f683c00b60d97e8.tar.xz
openshift-9c06b1e7fc9cdf7a5cc190ce7f683c00b60d97e8.zip
GlusterFS: Adjust when clauses for registry config
Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
-rw-r--r--roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml2
-rw-r--r--roles/openshift_storage_glusterfs/tasks/main.yml3
2 files changed, 2 insertions, 3 deletions
diff --git a/roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml b/roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml
index 7fc312880..2d06a2d24 100644
--- a/roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml
+++ b/roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml
@@ -21,7 +21,7 @@
- include: glusterfs_common.yml
when:
- - "'glusterfs_registry' in groups"
+ - groups.glusterfs_registry | default([]) | count > 0
- "'glusterfs' not in groups or groups.glusterfs_registry != groups.glusterfs"
- name: Delete pre-existing GlusterFS registry resources
diff --git a/roles/openshift_storage_glusterfs/tasks/main.yml b/roles/openshift_storage_glusterfs/tasks/main.yml
index 3efd995c0..c9bfdd1cd 100644
--- a/roles/openshift_storage_glusterfs/tasks/main.yml
+++ b/roles/openshift_storage_glusterfs/tasks/main.yml
@@ -11,8 +11,7 @@
- include: glusterfs_registry.yml
when:
- - groups.glusterfs_registry | default([]) | count > 0
- - "openshift.hosted.registry.storage.kind == 'glusterfs' or openshift.hosted.registry.glusterfs.swap"
+ - "groups.glusterfs_registry | default([]) | count > 0 or openshift.hosted.registry.storage.kind == 'glusterfs' or openshift.hosted.registry.glusterfs.swap"
- name: Delete temp directory
file: