diff options
author | Michael Gugino <gugino.michael@yahoo.com> | 2017-11-28 17:03:35 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-28 17:03:35 -0500 |
commit | bc77099615299390638a69adcf96c0a67c5e5275 (patch) | |
tree | ff1997a11c2ef0107778fb34f97ff5a2182a7ec9 /roles/openshift_facts | |
parent | 8755f3279980fb9d3dc9166c197975f243893c72 (diff) | |
parent | 602310de78f785c9715f97075c67e176a2c62932 (diff) | |
download | openshift-bc77099615299390638a69adcf96c0a67c5e5275.tar.gz openshift-bc77099615299390638a69adcf96c0a67c5e5275.tar.bz2 openshift-bc77099615299390638a69adcf96c0a67c5e5275.tar.xz openshift-bc77099615299390638a69adcf96c0a67c5e5275.zip |
Merge pull request #6299 from mgugino-upstream-stage/dns-facts
Remove dns_port fact
Diffstat (limited to 'roles/openshift_facts')
-rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 01390a901..44983cfd6 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -498,21 +498,6 @@ def set_selectors(facts): return facts -def set_dnsmasq_facts_if_unset(facts): - """ Set dnsmasq facts if not already present in facts - Args: - facts (dict) existing facts - Returns: - facts (dict) updated facts with values set if not previously set - """ - - if 'common' in facts: - if 'master' in facts and 'dns_port' not in facts['master']: - facts['master']['dns_port'] = 8053 - - return facts - - def set_project_cfg_facts_if_unset(facts): """ Set Project Configuration facts if not already present in facts dict dict: @@ -1825,7 +1810,6 @@ class OpenShiftFacts(object): facts = build_controller_args(facts) facts = build_api_server_args(facts) facts = set_version_facts_if_unset(facts) - facts = set_dnsmasq_facts_if_unset(facts) facts = set_aggregate_facts(facts) facts = set_etcd_facts_if_unset(facts) facts = set_proxy_facts(facts) |