summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts/library
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-11-27 16:15:28 -0500
committerMichael Gugino <mgugino@redhat.com>2017-11-27 16:58:07 -0500
commitb9010d93f61600364b37b7fda772bca71f0a6bd3 (patch)
treef5277a38d1663e2d265176f6caf1dfbdabad0dd2 /roles/openshift_facts/library
parente7e699a4201754fe9ccd1b9adffad5be5fff18b3 (diff)
downloadopenshift-b9010d93f61600364b37b7fda772bca71f0a6bd3.tar.gz
openshift-b9010d93f61600364b37b7fda772bca71f0a6bd3.tar.bz2
openshift-b9010d93f61600364b37b7fda772bca71f0a6bd3.tar.xz
openshift-b9010d93f61600364b37b7fda772bca71f0a6bd3.zip
remove schedulable from openshift_facts
This commit removes schedulable from openshift_facts in favor of detecting whether or not a host is a master via inventory.
Diffstat (limited to 'roles/openshift_facts/library')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py19
1 files changed, 0 insertions, 19 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index f94e0e097..9a13cd52b 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -446,24 +446,6 @@ def normalize_provider_facts(provider, metadata):
return facts
-def set_node_schedulability(facts):
- """ Set schedulable facts if not already present in facts dict
- Args:
- facts (dict): existing facts
- Returns:
- dict: the facts dict updated with the generated schedulable
- facts if they were not already present
-
- """
- if 'node' in facts:
- if 'schedulable' not in facts['node']:
- if 'master' in facts:
- facts['node']['schedulable'] = False
- else:
- facts['node']['schedulable'] = True
- return facts
-
-
# pylint: disable=too-many-branches
def set_selectors(facts):
""" Set selectors facts if not already present in facts dict
@@ -1838,7 +1820,6 @@ class OpenShiftFacts(object):
facts['current_config'] = get_current_config(facts)
facts = set_url_facts_if_unset(facts)
facts = set_project_cfg_facts_if_unset(facts)
- facts = set_node_schedulability(facts)
facts = set_selectors(facts)
facts = set_identity_providers_if_unset(facts)
facts = set_deployment_facts_if_unset(facts)