summaryrefslogtreecommitdiffstats
path: root/roles/openshift_sanitize_inventory
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-11-29 09:37:11 -0500
committerGitHub <noreply@github.com>2017-11-29 09:37:11 -0500
commitaff556902f5851d61df34a83dfff2b3ff891fef8 (patch)
treed6247557b0eb5cd2936608ba5c0b93dc4a9281f5 /roles/openshift_sanitize_inventory
parent8f9f84b27ce12d07eed2269df0a118f112554f7a (diff)
parente893c818a62665729bcdabe27cf0b3f05937d374 (diff)
downloadopenshift-aff556902f5851d61df34a83dfff2b3ff891fef8.tar.gz
openshift-aff556902f5851d61df34a83dfff2b3ff891fef8.tar.bz2
openshift-aff556902f5851d61df34a83dfff2b3ff891fef8.tar.xz
openshift-aff556902f5851d61df34a83dfff2b3ff891fef8.zip
Merge pull request #5723 from mjudeikis/gluster-registry-backend
Add external glusterfs backend to hosted and glusterfs playbook
Diffstat (limited to 'roles/openshift_sanitize_inventory')
-rw-r--r--roles/openshift_sanitize_inventory/tasks/unsupported.yml24
1 files changed, 24 insertions, 0 deletions
diff --git a/roles/openshift_sanitize_inventory/tasks/unsupported.yml b/roles/openshift_sanitize_inventory/tasks/unsupported.yml
index b70ab90a1..1c4984467 100644
--- a/roles/openshift_sanitize_inventory/tasks/unsupported.yml
+++ b/roles/openshift_sanitize_inventory/tasks/unsupported.yml
@@ -40,3 +40,27 @@
openshift_master_dynamic_provisioning_enabled to True and set an
openshift_cloudprovider_kind. You can disable this check with
'dynamic_volumes_check=False'.
+
+#if we have registry backend as glusterfs, and we have clashing configuration.
+- 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 != ''
+ - "'glusterfs_registry' in groups | default([])"
+ fail:
+ msg: |-
+ Configuring a value for openshift_hosted_registry_storage_glusterfs_ips and with a glusterfs_registry host group is not allowed.
+ Specifying a glusterfs_registry host group indicates that a new GlusterFS cluster should be configured, whereas
+ specifying openshift_hosted_registry_storage_glusterfs_ips indicates wanting to use a pre-configured GlusterFS cluster for the registry storage.
+
+#if we have registry backend as glusterfs and no gluster specified.
+- name: Ensure the hosted registry's GlusterFS storage is configured correctly
+ when:
+ - openshift_hosted_registry_storage_kind | default(none) in ['glusterfs']
+ - not openshift_hosted_registry_storage_glusterfs_ips is defined
+ - not 'glusterfs_registry' in groups | default([])
+ - not 'glusterfs' in groups | default([])
+ fail:
+ msg: |-
+ Configuring a value for openshift_hosted_registry_storage_kind=glusterfs without a any glusterfs option is not allowed.
+ Specify either openshift_hosted_registry_storage_glusterfs_ips variable or glusterfs, glusterfs_registry host groups.