summaryrefslogtreecommitdiffstats
path: root/roles/openshift_docker_facts
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-09-04 23:02:08 -0400
committerGitHub <noreply@github.com>2016-09-04 23:02:08 -0400
commit5ca0a74fb271678708268c940fd52ccd15d207ca (patch)
tree9ebe1aedcabccef7968d7aa99dcce5905e618f77 /roles/openshift_docker_facts
parent88ef051955288fbfaedebe35a12b64d00ac285a1 (diff)
parent9c114231850ac265e7414afefbf78da194d0a8e4 (diff)
downloadopenshift-5ca0a74fb271678708268c940fd52ccd15d207ca.tar.gz
openshift-5ca0a74fb271678708268c940fd52ccd15d207ca.tar.bz2
openshift-5ca0a74fb271678708268c940fd52ccd15d207ca.tar.xz
openshift-5ca0a74fb271678708268c940fd52ccd15d207ca.zip
Merge pull request #2409 from abutcher/secure-registry
Secure registry for atomic registry deployment
Diffstat (limited to 'roles/openshift_docker_facts')
-rw-r--r--roles/openshift_docker_facts/tasks/main.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_docker_facts/tasks/main.yml b/roles/openshift_docker_facts/tasks/main.yml
index eb8b5e99b..0ce142983 100644
--- a/roles/openshift_docker_facts/tasks/main.yml
+++ b/roles/openshift_docker_facts/tasks/main.yml
@@ -13,7 +13,7 @@
log_options: "{{ openshift_docker_log_options | default(None) }}"
options: "{{ openshift_docker_options | default(None) }}"
disable_push_dockerhub: "{{ openshift_disable_push_dockerhub | default(None) }}"
- hosted_registry_insecure: "{{ openshift_docker_hosted_registry_insecure | default(None) }}"
+ hosted_registry_insecure: "{{ openshift_docker_hosted_registry_insecure | default(openshift.common.deployment_subtype != 'registry') }}"
hosted_registry_network: "{{ openshift_docker_hosted_registry_network | default(None) }}"
- set_fact: