|
@@ -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)
|
|
|
|