summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts/library
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-05-06 16:55:02 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-05-06 16:55:02 -0400
commita9bf2540412983ff65ea376eb2ed0675536dd102 (patch)
treeec49ad2928959b39fee036d677b833528418beae /roles/openshift_facts/library
parent4f3f588ee59a1e888340d24ba912346c240cacc6 (diff)
parent31c3daf9d81afcb85bd22c8ad47eea9381c5cc34 (diff)
downloadopenshift-a9bf2540412983ff65ea376eb2ed0675536dd102.tar.gz
openshift-a9bf2540412983ff65ea376eb2ed0675536dd102.tar.bz2
openshift-a9bf2540412983ff65ea376eb2ed0675536dd102.tar.xz
openshift-a9bf2540412983ff65ea376eb2ed0675536dd102.zip
Merge tag 'openshift-ansible-3.0.88-1'
Tagging package [openshift-ansible] version [3.0.88-1] in directory [./].
Diffstat (limited to 'roles/openshift_facts/library')
-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 643984982..bfd09676f 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