From d195bb2dba76da80df33b777a13d2d719e74b735 Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Mon, 19 Jun 2017 16:15:42 -0400 Subject: Run dns on the node and use that for dnsmasq --- roles/openshift_node_dnsmasq/templates/node-dnsmasq.conf.j2 | 2 ++ roles/openshift_node_dnsmasq/templates/origin-dns.conf.j2 | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 roles/openshift_node_dnsmasq/templates/node-dnsmasq.conf.j2 (limited to 'roles/openshift_node_dnsmasq/templates') diff --git a/roles/openshift_node_dnsmasq/templates/node-dnsmasq.conf.j2 b/roles/openshift_node_dnsmasq/templates/node-dnsmasq.conf.j2 new file mode 100644 index 000000000..4377403df --- /dev/null +++ b/roles/openshift_node_dnsmasq/templates/node-dnsmasq.conf.j2 @@ -0,0 +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 }} diff --git a/roles/openshift_node_dnsmasq/templates/origin-dns.conf.j2 b/roles/openshift_node_dnsmasq/templates/origin-dns.conf.j2 index 8bae9aaac..eac18cb4b 100644 --- a/roles/openshift_node_dnsmasq/templates/origin-dns.conf.j2 +++ b/roles/openshift_node_dnsmasq/templates/origin-dns.conf.j2 @@ -1,5 +1,5 @@ no-resolv domain-needed -server=/{{ openshift.common.dns_domain }}/{{ openshift.common.kube_svc_ip }} no-negcache max-cache-ttl=1 +enable-dbus -- cgit v1.2.3 From d9c30f08cebe462a62e9c5131b6e3cec6b01e80a Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Fri, 30 Jun 2017 08:06:17 -0400 Subject: Use default ports for dnsmasq and node dns --- roles/openshift_node_dnsmasq/templates/node-dnsmasq.conf.j2 | 4 ++-- roles/openshift_node_dnsmasq/templates/origin-dns.conf.j2 | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'roles/openshift_node_dnsmasq/templates') 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