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 /roles/openshift_hosted | |
| 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 'roles/openshift_hosted')
| -rw-r--r-- | roles/openshift_hosted/tasks/registry/registry.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_hosted/tasks/registry/registry.yml b/roles/openshift_hosted/tasks/registry/registry.yml index c29df1873..93b701ebc 100644 --- a/roles/openshift_hosted/tasks/registry/registry.yml +++ b/roles/openshift_hosted/tasks/registry/registry.yml @@ -53,7 +53,7 @@ - include: secure.yml static: no - when: replicas | int > 0 + when: replicas | int > 0 and not (openshift.docker.hosted_registry_insecure | default(false) | bool) - include: storage/object_storage.yml static: no |