diff options
author | Michael Gugino <gugino.michael@yahoo.com> | 2017-11-28 10:31:30 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-28 10:31:30 -0500 |
commit | c7645af60a5411af83b04fb6a5617887d3b39183 (patch) | |
tree | c7164fe7b30a54d810ea4c23f43c89f73038284b /roles/openshift_facts | |
parent | 192b8477faa018d31893b322f43f356ce3ac1c80 (diff) | |
parent | b9010d93f61600364b37b7fda772bca71f0a6bd3 (diff) | |
download | openshift-c7645af60a5411af83b04fb6a5617887d3b39183.tar.gz openshift-c7645af60a5411af83b04fb6a5617887d3b39183.tar.bz2 openshift-c7645af60a5411af83b04fb6a5617887d3b39183.tar.xz openshift-c7645af60a5411af83b04fb6a5617887d3b39183.zip |
Merge pull request #6283 from mgugino-upstream-stage/schedulable
remove schedulable from openshift_facts
Diffstat (limited to 'roles/openshift_facts')
-rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 19 |
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 7a6202546..01390a901 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 @@ -1834,7 +1816,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) |