diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-17 13:24:39 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-17 13:24:39 -0400 |
| commit | df453bc226f92f3c68c82d290226dc0efc2417be (patch) | |
| tree | 46f3a628edd93350b3ed889da37ae11c29140ba0 /roles/openshift_facts | |
| parent | 3dbcb72f88b951247f1eb999bcf7f36df902de8e (diff) | |
| parent | bc114a192e2682204aa237fb7d69009ddfa5b747 (diff) | |
| download | openshift-df453bc226f92f3c68c82d290226dc0efc2417be.tar.gz openshift-df453bc226f92f3c68c82d290226dc0efc2417be.tar.bz2 openshift-df453bc226f92f3c68c82d290226dc0efc2417be.tar.xz openshift-df453bc226f92f3c68c82d290226dc0efc2417be.zip | |
Merge pull request #1614 from detiber/bz1317755
Bug 1317755 - Set insecure-registry for internal registry by default
Diffstat (limited to 'roles/openshift_facts')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 5 |
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) |