Skip to content

Updated registry fact with latest deployment_type mappings #660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brenton merged 1 commit into from
Oct 7, 2015
Merged

Updated registry fact with latest deployment_type mappings #660

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions roles/openshift_facts/library/openshift_facts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}'
Copy link
Member Author

@sdodson sdodson Oct 6, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@brenton Is this the anticipated repo for atomic-enterprise?

Copy link
Contributor

@brenton brenton Oct 6, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, as we best we know now.

facts[role]['registry_url'] = registry_url

return facts
Expand Down