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 /roles/openshift_hosted | |
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 '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 |