diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2016-10-25 13:45:56 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2016-10-26 11:51:51 -0400 |
| commit | 33da79e7389a3fceeaf735663fd8051a0a2fe057 (patch) | |
| tree | 3d0199f6931e67f0deaea88502046f285970d5c3 /playbooks/common | |
| parent | 1f28e81f3e5704f21e26b905fcbadcd7d87482a4 (diff) | |
| download | openshift-33da79e7389a3fceeaf735663fd8051a0a2fe057.tar.gz openshift-33da79e7389a3fceeaf735663fd8051a0a2fe057.tar.bz2 openshift-33da79e7389a3fceeaf735663fd8051a0a2fe057.tar.xz openshift-33da79e7389a3fceeaf735663fd8051a0a2fe057.zip | |
Default hosted_registry_insecure true when insecure registry present in existing /etc/sysconfig/docker.
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/openshift_hosted.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/openshift_hosted.yml b/playbooks/common/openshift-cluster/openshift_hosted.yml index 352d266a5..ccbba54b4 100644 --- a/playbooks/common/openshift-cluster/openshift_hosted.yml +++ b/playbooks/common/openshift-cluster/openshift_hosted.yml @@ -65,4 +65,4 @@ openshift_hosted_logging_elasticsearch_ops_pvc_prefix: "{{ 'logging-es' if openshift_hosted_logging_storage_kind | default(none) =='dynamic' else '' }}" - role: cockpit-ui - when: ( openshift.common.version_gte_3_3_or_1_3 | bool ) and ( openshift_hosted_manage_registry | default(true) | bool ) + when: ( openshift.common.version_gte_3_3_or_1_3 | bool ) and ( openshift_hosted_manage_registry | default(true) | bool ) and not (openshift.docker.hosted_registry_insecure | default(false) | bool) |