diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-10-26 16:49:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-26 16:49:11 -0400 |
| commit | cab68138cd264b9a4cb5dad9801a42ee50e1bc9b (patch) | |
| tree | 803b6245cb49fc7e22f58af895243869a529b6bb /playbooks/common | |
| parent | 52ab71a6f741f2477ab395d48dacfe609cf1411a (diff) | |
| parent | 33da79e7389a3fceeaf735663fd8051a0a2fe057 (diff) | |
| download | openshift-cab68138cd264b9a4cb5dad9801a42ee50e1bc9b.tar.gz openshift-cab68138cd264b9a4cb5dad9801a42ee50e1bc9b.tar.bz2 openshift-cab68138cd264b9a4cb5dad9801a42ee50e1bc9b.tar.xz openshift-cab68138cd264b9a4cb5dad9801a42ee50e1bc9b.zip | |
Merge pull request #2670 from abutcher/hosted-registry-insecure
Bug 1388016 - The insecure-registry address was removed during upgrade
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) |