summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-10-27 13:34:53 -0400
committerJason DeTiberus <jdetiber@redhat.com>2015-10-27 13:34:53 -0400
commit8bfcf17c0355464123146685e31e06a27182b1a9 (patch)
treec2962284d996f21b6b99157142a1c78f874d3e41 /roles/openshift_facts
parent56660d50f1480d6c7ba7b83c4b172084614e6226 (diff)
downloadopenshift-8bfcf17c0355464123146685e31e06a27182b1a9.tar.gz
openshift-8bfcf17c0355464123146685e31e06a27182b1a9.tar.bz2
openshift-8bfcf17c0355464123146685e31e06a27182b1a9.tar.xz
openshift-8bfcf17c0355464123146685e31e06a27182b1a9.zip
make storage_plugin_deps conditional on deployment_type
Diffstat (limited to 'roles/openshift_facts')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py26
1 files changed, 9 insertions, 17 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 95ee822a9..220dce702 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -469,25 +469,10 @@ def set_aggregate_facts(facts):
return facts
-def set_node_plugin_facts_if_unset(facts):
- """ Set Facts for node storage plugin dependencies if not set.
-
- Args:
- facts (dict): existing facts
- Returns:
- dict: the facts dict updated with the generated storage plugin
- dependency facts
- """
- if 'node' in facts:
- if 'storage_plugin_deps' not in facts['node']:
- facts['node']['storage_plugin_deps'] = ['ceph', 'glusterfs']
-
- return facts
-
def set_deployment_facts_if_unset(facts):
""" Set Facts that vary based on deployment_type. This currently
includes common.service_type, common.config_base, master.registry_url,
- node.registry_url
+ node.registry_url, node.storage_plugin_deps
Args:
facts (dict): existing facts
@@ -529,6 +514,14 @@ def set_deployment_facts_if_unset(facts):
registry_url = 'aep3/aep-${component}:${version}'
facts[role]['registry_url'] = registry_url
+ if 'node' in facts:
+ deployment_type = facts['common']['deployment_type']
+ if 'storage_plugin_deps' not in facts['node']:
+ if deployment_type in ['openshift-enterprise', 'atomic-enterprise']:
+ facts['node']['storage_plugin_deps'] = ['ceph', 'glusterfs']
+ else:
+ facts['node']['storage_plugin_deps'] = []
+
return facts
@@ -829,7 +822,6 @@ class OpenShiftFacts(object):
facts = set_identity_providers_if_unset(facts)
facts = set_sdn_facts_if_unset(facts)
facts = set_deployment_facts_if_unset(facts)
- facts = set_node_plugin_facts_if_unset(facts)
facts = set_aggregate_facts(facts)
return dict(openshift=facts)