From 9c06b1e7fc9cdf7a5cc190ce7f683c00b60d97e8 Mon Sep 17 00:00:00 2001 From: "Jose A. Rivera" Date: Mon, 15 May 2017 15:55:00 -0500 Subject: GlusterFS: Adjust when clauses for registry config Signed-off-by: Jose A. Rivera --- roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml | 2 +- roles/openshift_storage_glusterfs/tasks/main.yml | 3 +-- 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: -- cgit v1.2.3