From d9c30f08cebe462a62e9c5131b6e3cec6b01e80a Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Fri, 30 Jun 2017 08:06:17 -0400
Subject: Use default ports for dnsmasq and node dns
---
roles/openshift_node_dnsmasq/defaults/main.yml | 1 -
roles/openshift_node_dnsmasq/templates/node-dnsmasq.conf.j2 | 4 ++--
roles/openshift_node_dnsmasq/templates/origin-dns.conf.j2 | 2 ++
3 files changed, 4 insertions(+), 3 deletions(-)
(limited to 'roles/openshift_node_dnsmasq')
diff --git a/roles/openshift_node_dnsmasq/defaults/main.yml b/roles/openshift_node_dnsmasq/defaults/main.yml
index 06b2c4123..ed97d539c 100644
--- a/roles/openshift_node_dnsmasq/defaults/main.yml
+++ b/roles/openshift_node_dnsmasq/defaults/main.yml
@@ -1,2 +1 @@
---
-r_openshift_node_dnsmasq_port: 8054
diff --git a/roles/openshift_node_dnsmasq/templates/node-dnsmasq.conf.j2 b/roles/openshift_node_dnsmasq/templates/node-dnsmasq.conf.j2
index 4377403df..3caa3bd4a 100644
--- a/roles/openshift_node_dnsmasq/templates/node-dnsmasq.conf.j2
+++ b/roles/openshift_node_dnsmasq/templates/node-dnsmasq.conf.j2
@@ -1,2 +1,2 @@
-server=/in-addr.arpa/127.0.0.1#{{ r_openshift_node_dnsmasq_port }}
-server=/{{ openshift.common.dns_domain }}/127.0.0.1#{{ r_openshift_node_dnsmasq_port }}
+server=/in-addr.arpa/127.0.0.1
+server=/{{ openshift.common.dns_domain }}/127.0.0.1
diff --git a/roles/openshift_node_dnsmasq/templates/origin-dns.conf.j2 b/roles/openshift_node_dnsmasq/templates/origin-dns.conf.j2
index eac18cb4b..779b4d2f5 100644
--- a/roles/openshift_node_dnsmasq/templates/origin-dns.conf.j2
+++ b/roles/openshift_node_dnsmasq/templates/origin-dns.conf.j2
@@ -3,3 +3,5 @@ domain-needed
no-negcache
max-cache-ttl=1
enable-dbus
+bind-interfaces
+listen-address={{ ansible_default_ipv4.address }}
--
cgit v1.2.3