summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-25 23:18:06 -0800
committerGitHub <noreply@github.com>2018-01-25 23:18:06 -0800
commit664d655f8d7808e1dae513f5949eb62601fe4e26 (patch)
treeba56335c8741e303c9de9fe04c966438585bbcce /roles
parent26f327b96cbe3072589105decee4a7d78932668b (diff)
parent10503140b3fb6a33565cf500ebf274d885ae2d18 (diff)
downloadopenshift-664d655f8d7808e1dae513f5949eb62601fe4e26.tar.gz
openshift-664d655f8d7808e1dae513f5949eb62601fe4e26.tar.bz2
openshift-664d655f8d7808e1dae513f5949eb62601fe4e26.tar.xz
openshift-664d655f8d7808e1dae513f5949eb62601fe4e26.zip
Merge pull request #6857 from mtnbikenc/fix-1537946
Automatic merge from submit-queue. [1537946] Correct conditional check for GlusterFS IPs Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1537946
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_sanitize_inventory/tasks/unsupported.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/roles/openshift_sanitize_inventory/tasks/unsupported.yml b/roles/openshift_sanitize_inventory/tasks/unsupported.yml
index 1c4984467..be0715ab5 100644
--- a/roles/openshift_sanitize_inventory/tasks/unsupported.yml
+++ b/roles/openshift_sanitize_inventory/tasks/unsupported.yml
@@ -45,7 +45,8 @@
- name: Ensure the hosted registry's GlusterFS storage is configured correctly
when:
- openshift_hosted_registry_storage_kind | default(none) in ['glusterfs']
- - openshift_hosted_registry_storage_glusterfs_ips is defined and openshift_hosted_registry_storage_glusterfs_ips != ''
+ - openshift_hosted_registry_storage_glusterfs_ips is defined
+ - openshift_hosted_registry_storage_glusterfs_ips != []
- "'glusterfs_registry' in groups | default([])"
fail:
msg: |-