summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-10-13 14:10:13 -0400
committerGitHub <noreply@github.com>2016-10-13 14:10:13 -0400
commit3b1ebb6a454bf04f7e5439ac9e5b64e0e4b67792 (patch)
tree5777c258e977fda04050e252e94591094f3f5574
parentce09c8a3c767acbac6c5bc53d1f65774482bc757 (diff)
parent9a64840fc11bd466502ae18e556f322447b11781 (diff)
downloadopenshift-3b1ebb6a454bf04f7e5439ac9e5b64e0e4b67792.tar.gz
openshift-3b1ebb6a454bf04f7e5439ac9e5b64e0e4b67792.tar.bz2
openshift-3b1ebb6a454bf04f7e5439ac9e5b64e0e4b67792.tar.xz
openshift-3b1ebb6a454bf04f7e5439ac9e5b64e0e4b67792.zip
Merge pull request #2598 from detiber/2547
update handling of use_dnsmasq
-rw-r--r--playbooks/common/openshift-node/config.yml4
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index 364a62dd0..5191662f7 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -67,7 +67,7 @@
openshift_ca_host: "{{ groups.oo_first_master.0 }}"
- role: openshift_cloud_provider
- role: openshift_node_dnsmasq
- when: openshift.common.use_dnsmasq
+ when: openshift.common.use_dnsmasq | bool
- role: os_firewall
os_firewall_allow:
- service: Kubernetes kubelet
@@ -106,7 +106,7 @@
openshift_ca_host: "{{ groups.oo_first_master.0 }}"
- role: openshift_cloud_provider
- role: openshift_node_dnsmasq
- when: openshift.common.use_dnsmasq
+ when: openshift.common.use_dnsmasq | bool
- role: os_firewall
os_firewall_allow:
- service: Kubernetes kubelet
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 0ee018c5c..cb642e12e 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -501,8 +501,8 @@ def set_dnsmasq_facts_if_unset(facts):
"""
if 'common' in facts:
- facts['common']['use_dnsmasq'] = bool('use_dnsmasq' not in facts['common'] and
- safe_get_bool(facts['common']['version_gte_3_2_or_1_2']))
+ if 'use_dnsmasq' not in facts['common']:
+ facts['common']['use_dnsmasq'] = bool(safe_get_bool(facts['common']['version_gte_3_2_or_1_2']))
if 'master' in facts and 'dns_port' not in facts['master']:
if safe_get_bool(facts['common']['use_dnsmasq']):
facts['master']['dns_port'] = 8053