summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts/library
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-02-11 16:18:12 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-02-11 16:18:12 -0500
commit2fd931794bf82cf3e11ad9267df9e0885dde7b1d (patch)
treea0d133dead7cfc2ca567c0238cadf9e1a72cafb2 /roles/openshift_facts/library
parent1d65d7df8bc2829e8b536ba44ad2dd3a426f2461 (diff)
parent2b3af4a3d009e6eac172db437b1e701ec5004dc9 (diff)
downloadopenshift-2fd931794bf82cf3e11ad9267df9e0885dde7b1d.tar.gz
openshift-2fd931794bf82cf3e11ad9267df9e0885dde7b1d.tar.bz2
openshift-2fd931794bf82cf3e11ad9267df9e0885dde7b1d.tar.xz
openshift-2fd931794bf82cf3e11ad9267df9e0885dde7b1d.zip
Merge pull request #1324 from abutcher/fluentd-fixes
Remove fluentd_master and fluentd_node roles
Diffstat (limited to 'roles/openshift_facts/library')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py18
1 files changed, 0 insertions, 18 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 5f5c5c788..20f6cc5c8 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -304,23 +304,6 @@ def normalize_provider_facts(provider, metadata):
facts = normalize_openstack_facts(metadata, facts)
return facts
-def set_fluentd_facts_if_unset(facts):
- """ Set fluentd facts if not already present in facts dict
- dict: the facts dict updated with the generated fluentd facts if
- missing
- Args:
- facts (dict): existing facts
- Returns:
- dict: the facts dict updated with the generated fluentd
- facts if they were not already present
-
- """
- if 'common' in facts:
- if 'use_fluentd' not in facts['common']:
- use_fluentd = False
- facts['common']['use_fluentd'] = use_fluentd
- return facts
-
def set_flannel_facts_if_unset(facts):
""" Set flannel facts if not already present in facts dict
dict: the facts dict updated with the flannel facts if
@@ -1171,7 +1154,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_fluentd_facts_if_unset(facts)
facts = set_flannel_facts_if_unset(facts)
facts = set_nuage_facts_if_unset(facts)
facts = set_node_schedulability(facts)