summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-10-07 16:34:47 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2015-10-07 16:34:47 -0400
commit3bd2ebe0ecae022a027b1d4af7e4820786415cf2 (patch)
treed3155543a6dbcf1bbba9f788c0a11dfbf2bdb8e7
parent3b3e1ff77ca8f3b1efa34587e4fbdbbd599b718d (diff)
parent3782c361b896cc382a0f5585b2ee9e9295536486 (diff)
downloadopenshift-3bd2ebe0ecae022a027b1d4af7e4820786415cf2.tar.gz
openshift-3bd2ebe0ecae022a027b1d4af7e4820786415cf2.tar.bz2
openshift-3bd2ebe0ecae022a027b1d4af7e4820786415cf2.tar.xz
openshift-3bd2ebe0ecae022a027b1d4af7e4820786415cf2.zip
Merge pull request #660 from sdodson/updated-registry-facts
Updated registry fact with latest deployment_type mappings
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 987f7f7da..69bb49c9b 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -480,11 +480,11 @@ def set_deployment_facts_if_unset(facts):
if role in facts:
deployment_type = facts['common']['deployment_type']
if 'registry_url' not in facts[role]:
- registry_url = 'aos3/aos-${component}:${version}'
- if deployment_type in ['enterprise', 'online']:
+ registry_url = 'openshift/origin-${component}:${version}'
+ if deployment_type in ['enterprise', 'online', 'openshift-enterprise']:
registry_url = 'openshift3/ose-${component}:${version}'
- elif deployment_type == 'origin':
- registry_url = 'openshift/origin-${component}:${version}'
+ elif deployment_type == 'atomic-enterprise':
+ registry_url = 'aep3/aep-${component}:${version}'
facts[role]['registry_url'] = registry_url
return facts