summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2016-03-15 22:21:39 -0400
committerJason DeTiberus <jdetiber@redhat.com>2016-03-17 00:46:02 -0400
commitbc114a192e2682204aa237fb7d69009ddfa5b747 (patch)
tree081da29f0ab839e6530eb183dcb4ea6b44fcb14c /roles/openshift_facts
parent4551e7cddf4a9d1756a064fd31777b6bed7d3567 (diff)
downloadopenshift-bc114a192e2682204aa237fb7d69009ddfa5b747.tar.gz
openshift-bc114a192e2682204aa237fb7d69009ddfa5b747.tar.bz2
openshift-bc114a192e2682204aa237fb7d69009ddfa5b747.tar.xz
openshift-bc114a192e2682204aa237fb7d69009ddfa5b747.zip
Bug 1317755 - Set insecure-registry for internal registry by default
Diffstat (limited to 'roles/openshift_facts')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index b06900681..263daf210 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -50,6 +50,10 @@ def migrate_docker_facts(facts):
old_param = 'docker_' + param
if old_param in facts[role]:
facts['docker'][param] = facts[role].pop(old_param)
+
+ if 'node' in facts and 'portal_net' in facts['node']:
+ facts['docker']['hosted_registry_insecure'] = True
+ facts['docker']['hosted_registry_network'] = facts['node'].pop('portal_net')
return facts
def migrate_local_facts(facts):
@@ -1402,7 +1406,6 @@ class OpenShiftFacts(object):
if 'node' in roles:
defaults['node'] = dict(labels={}, annotations={},
- portal_net='172.30.0.0/16',
iptables_sync_period='5s',
set_node_ip=False)