summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2015-10-06 09:37:37 -0400
committerScott Dodson <sdodson@redhat.com>2015-10-06 10:14:33 -0400
commit3782c361b896cc382a0f5585b2ee9e9295536486 (patch)
tree0f060ede9a6422f3fb8f3dded766a7f21be049bc
parentc22b5f256d9d673ea7466a320d2efb50b512b700 (diff)
downloadopenshift-3782c361b896cc382a0f5585b2ee9e9295536486.tar.gz
openshift-3782c361b896cc382a0f5585b2ee9e9295536486.tar.bz2
openshift-3782c361b896cc382a0f5585b2ee9e9295536486.tar.xz
openshift-3782c361b896cc382a0f5585b2ee9e9295536486.zip
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