summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts/library
diff options
context:
space:
mode:
authorSamuel Munilla <smunilla@redhat.com>2016-07-27 09:14:42 -0400
committerSamuel Munilla <smunilla@redhat.com>2016-08-26 10:57:45 -0400
commit2fe8715d9935dc7372dab68fa2b93a702265a119 (patch)
treef29dbb53a9b17f7213c90d4975d685f47b6ca302 /roles/openshift_facts/library
parent577195e3eefe19b95e39f0f52834cd3dc8f77cdf (diff)
downloadopenshift-2fe8715d9935dc7372dab68fa2b93a702265a119.tar.gz
openshift-2fe8715d9935dc7372dab68fa2b93a702265a119.tar.bz2
openshift-2fe8715d9935dc7372dab68fa2b93a702265a119.tar.xz
openshift-2fe8715d9935dc7372dab68fa2b93a702265a119.zip
Add support for Atomic Registry Installs
Add the Registry deployment subtype as an option in the quick installer.
Diffstat (limited to 'roles/openshift_facts/library')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index ff4d9c946..805f36cec 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -1657,7 +1657,12 @@ class OpenShiftFacts(object):
else:
deployment_type = 'origin'
- defaults = self.get_defaults(roles, deployment_type)
+ if 'common' in local_facts and 'deployment_subtype' in local_facts['common']:
+ deployment_subtype = local_facts['common']['deployment_subtype']
+ else:
+ deployment_subtype = 'basic'
+
+ defaults = self.get_defaults(roles, deployment_type, deployment_subtype)
provider_facts = self.init_provider_facts()
facts = apply_provider_facts(defaults, provider_facts)
facts = merge_facts(facts,
@@ -1689,7 +1694,7 @@ class OpenShiftFacts(object):
facts = set_installed_variant_rpm_facts(facts)
return dict(openshift=facts)
- def get_defaults(self, roles, deployment_type):
+ def get_defaults(self, roles, deployment_type, deployment_subtype):
""" Get default fact values
Args:
@@ -1709,6 +1714,7 @@ class OpenShiftFacts(object):
defaults['common'] = dict(use_openshift_sdn=True, ip=ip_addr,
public_ip=ip_addr,
deployment_type=deployment_type,
+ deployment_subtype=deployment_subtype,
hostname=hostname,
public_hostname=hostname,
portal_net='172.30.0.0/16',