summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-05-06 13:09:21 -0400
committerScott Dodson <sdodson@redhat.com>2016-05-06 16:51:59 -0400
commit3aa6b6ede1165bbce11c5d5d89927817ec940d61 (patch)
tree28e92b2e2b781bf885fed2026e8366fe24282d5e /roles/openshift_facts
parent7f67d5dbe872d40afbd00dcaab7f85f41a06910e (diff)
downloadopenshift-3aa6b6ede1165bbce11c5d5d89927817ec940d61.tar.gz
openshift-3aa6b6ede1165bbce11c5d5d89927817ec940d61.tar.bz2
openshift-3aa6b6ede1165bbce11c5d5d89927817ec940d61.tar.xz
openshift-3aa6b6ede1165bbce11c5d5d89927817ec940d61.zip
Fix unsafe boolean handling on use_dnsmasq
Diffstat (limited to 'roles/openshift_facts')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 8d7f12bc8..0ed85fc55 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -499,12 +499,12 @@ def set_dnsmasq_facts_if_unset(facts):
"""
if 'common' in facts:
- if 'use_dnsmasq' not in facts['common'] and facts['common']['version_gte_3_2_or_1_2']:
+ if 'use_dnsmasq' not in facts['common'] and safe_get_bool(facts['common']['version_gte_3_2_or_1_2']):
facts['common']['use_dnsmasq'] = True
else:
facts['common']['use_dnsmasq'] = False
if 'master' in facts and 'dns_port' not in facts['master']:
- if facts['common']['use_dnsmasq']:
+ if safe_get_bool(facts['common']['use_dnsmasq']):
facts['master']['dns_port'] = 8053
else:
facts['master']['dns_port'] = 53