From 4d4793233ec126b6bc43861732ccbe22b784ef0a Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Mon, 2 May 2016 11:23:10 -0400 Subject: Fix configuration of dns_ip --- filter_plugins/openshift_node.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filter_plugins/openshift_node.py b/filter_plugins/openshift_node.py index 4ef92ba03..22670cf79 100644 --- a/filter_plugins/openshift_node.py +++ b/filter_plugins/openshift_node.py @@ -26,7 +26,7 @@ class FilterModule(object): if openshift_dns_ip != None: return openshift_dns_ip - if bool(hostvars['openshift']['common']['version_gte_3_2_or_1_2']): + if bool(hostvars['openshift']['common']['use_dnsmasq']): return hostvars['ansible_default_ipv4']['address'] elif bool(hostvars['openshift']['common']['version_gte_3_1_or_1_1']): if 'openshift_master_cluster_vip' in hostvars: -- cgit v1.2.3 From 4634017844fc330253ccb417086dd710feea0025 Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Mon, 2 May 2016 11:35:20 -0400 Subject: listen on all interfaces --- roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh b/roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh index 51e0751e9..691fa32f3 100755 --- a/roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh +++ b/roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh @@ -46,7 +46,6 @@ EOF for ns in ${DHCP4_DOMAIN_NAME_SERVERS}; do echo "server=${ns}" >> /etc/dnsmasq.d/origin-upstream-dns.conf done - echo "listen-address=${def_route_ip}" >> /etc/dnsmasq.d/origin-upstream-dns.conf systemctl restart dnsmasq sed -i 's/^nameserver.*$/nameserver '"${def_route_ip}"'/g' /etc/resolv.conf -- cgit v1.2.3