summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts/library
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-05-16 16:58:54 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-05-16 16:58:54 -0400
commit984f84ce1b19704b16db669593d96153182fc206 (patch)
tree4305968d078b65aa4ec13036ec777ceeeaa3ce99 /roles/openshift_facts/library
parentbef0ae84568f8bcec002e27a6835c662a5f7c465 (diff)
parent84fbacbb0554fcfe425dffd88c83fab96c8c9c2b (diff)
downloadopenshift-984f84ce1b19704b16db669593d96153182fc206.tar.gz
openshift-984f84ce1b19704b16db669593d96153182fc206.tar.bz2
openshift-984f84ce1b19704b16db669593d96153182fc206.tar.xz
openshift-984f84ce1b19704b16db669593d96153182fc206.zip
Merge pull request #1880 from dgoodwin/registry-insecure
Fixes for openshift_docker_hosted_registry_insecure var.
Diffstat (limited to 'roles/openshift_facts/library')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index f8e447b84..b13343776 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -1712,7 +1712,7 @@ class OpenShiftFacts(object):
set_node_ip=False)
if 'docker' in roles:
- docker = dict(disable_push_dockerhub=False)
+ docker = dict(disable_push_dockerhub=False, hosted_registry_insecure=True)
version_info = get_docker_version_info()
if version_info is not None:
docker['api_version'] = version_info['api_version']