summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-11-30 08:41:40 -0500
committerScott Dodson <sdodson@redhat.com>2016-12-01 15:01:04 -0500
commitec7b1f7e70d4af7240371b7d05c83221f18c6ed3 (patch)
tree40b72706a0c0131bfc65fb59c0f70fe18546d1a8 /roles
parent4ff3ae5f8e99145a06a0cc9976ec07c008831b65 (diff)
downloadopenshift-ec7b1f7e70d4af7240371b7d05c83221f18c6ed3.tar.gz
openshift-ec7b1f7e70d4af7240371b7d05c83221f18c6ed3.tar.bz2
openshift-ec7b1f7e70d4af7240371b7d05c83221f18c6ed3.tar.xz
openshift-ec7b1f7e70d4af7240371b7d05c83221f18c6ed3.zip
openshift_node_dnsmasq - Remove strict-order option from dnsmasq
strict-order forces dnsmasq to iterate through nameservers in order. If one of the nameservers is down this will slow things down while dnsmasq waits for a timeout. Also, this option prevents dnsmasq from querying other nameservers if the first one returns a negative result. While I think it's odd to have a nameserver that returns negative results for a query that another returns positive results for this does seem to fix the issue in testing. Fixes Bug 1399577
Diffstat (limited to 'roles')
-rwxr-xr-xroles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh1
-rw-r--r--roles/openshift_node_dnsmasq/templates/origin-dns.conf.j21
2 files changed, 0 insertions, 2 deletions
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 089c3f7e4..ac8ee54e4 100755
--- a/roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh
+++ b/roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh
@@ -48,7 +48,6 @@ if [[ $2 =~ ^(up|dhcp4-change|dhcp6-change)$ ]]; then
-n "${IP4_NAMESERVERS}" ]]; then
if [ ! -f /etc/dnsmasq.d/origin-dns.conf ]; then
cat << EOF > /etc/dnsmasq.d/origin-dns.conf
-strict-order
no-resolv
domain-needed
server=/cluster.local/172.30.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 1753bb821..f397cbbf1 100644
--- a/roles/openshift_node_dnsmasq/templates/origin-dns.conf.j2
+++ b/roles/openshift_node_dnsmasq/templates/origin-dns.conf.j2
@@ -1,4 +1,3 @@
-strict-order
no-resolv
domain-needed
server=/{{ openshift.common.dns_domain }}/{{ openshift.common.kube_svc_ip }}