summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts/library
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2015-12-02 15:29:32 -0500
committerScott Dodson <sdodson@redhat.com>2015-12-15 17:07:17 -0500
commit3f2be7d987ccef8c4e157163dd9394ba6492a88c (patch)
tree737c27878e8679e4187f052e22b84eb4567600f4 /roles/openshift_facts/library
parent7a2891780e827513859628c7703cc1e7be53683f (diff)
downloadopenshift-3f2be7d987ccef8c4e157163dd9394ba6492a88c.tar.gz
openshift-3f2be7d987ccef8c4e157163dd9394ba6492a88c.tar.bz2
openshift-3f2be7d987ccef8c4e157163dd9394ba6492a88c.tar.xz
openshift-3f2be7d987ccef8c4e157163dd9394ba6492a88c.zip
Move all docker config into openshift_docker to minimize docker restarts
Diffstat (limited to 'roles/openshift_facts/library')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 35ee18f4f..c33e395a9 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -652,10 +652,9 @@ def set_deployment_facts_if_unset(facts):
if deployment_type in ['enterprise', 'atomic-enterprise', 'openshift-enterprise']:
addtl_regs = facts['common'].get('docker_additional_registries', [])
- ent_reg = ['registry.access.redhat.com']
+ ent_reg = 'registry.access.redhat.com'
if ent_reg not in addtl_regs:
- facts['common']['docker_additional_registries'] = addtl_regs + ent_reg
-
+ facts['common']['docker_additional_registries'] = addtl_regs + [ent_reg]
for role in ('master', 'node'):
if role in facts: