summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-12-01 15:04:27 -0500
committerGitHub <noreply@github.com>2016-12-01 15:04:27 -0500
commiteb9a8e5603ea4f0fc9291248c1cb59545f8a023e (patch)
tree20253803d94fd8f504aa216657cf1e3eb715225f
parentc65c07f4238b23ee0e4c72746927d587517518ce (diff)
parentec7b1f7e70d4af7240371b7d05c83221f18c6ed3 (diff)
downloadopenshift-eb9a8e5603ea4f0fc9291248c1cb59545f8a023e.tar.gz
openshift-eb9a8e5603ea4f0fc9291248c1cb59545f8a023e.tar.bz2
openshift-eb9a8e5603ea4f0fc9291248c1cb59545f8a023e.tar.xz
openshift-eb9a8e5603ea4f0fc9291248c1cb59545f8a023e.zip
Merge pull request #2888 from sdodson/dnsmasq-no-strict-order
openshift_node_dnsmasq - Remove strict-order option from dnsmasq
-rw-r--r--inventory/byo/hosts.origin.example3
-rw-r--r--inventory/byo/hosts.ose.example3
-rwxr-xr-xroles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh1
-rw-r--r--roles/openshift_node_dnsmasq/templates/origin-dns.conf.j21
4 files changed, 4 insertions, 4 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example
index 324e2477f..9caf5408f 100644
--- a/inventory/byo/hosts.origin.example
+++ b/inventory/byo/hosts.origin.example
@@ -588,7 +588,8 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
# be used with 1.0 and 3.0.
#openshift_use_dnsmasq=False
# Define an additional dnsmasq.conf file to deploy to /etc/dnsmasq.d/openshift-ansible.conf
-# This is useful for POC environments where DNS may not actually be available yet.
+# This is useful for POC environments where DNS may not actually be available yet or to set
+# options like 'strict-order' to alter dnsmasq configuration.
#openshift_node_dnsmasq_additional_config_file=/home/bob/ose-dnsmasq.conf
# Global Proxy Configuration
diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example
index 4a2925599..f1b3165f9 100644
--- a/inventory/byo/hosts.ose.example
+++ b/inventory/byo/hosts.ose.example
@@ -588,7 +588,8 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
# be used with 1.0 and 3.0.
#openshift_use_dnsmasq=False
# Define an additional dnsmasq.conf file to deploy to /etc/dnsmasq.d/openshift-ansible.conf
-# This is useful for POC environments where DNS may not actually be available yet.
+# This is useful for POC environments where DNS may not actually be available yet or to set
+# options like 'strict-order' to alter dnsmasq configuration.
#openshift_node_dnsmasq_additional_config_file=/home/bob/ose-dnsmasq.conf
# Global Proxy Configuration
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 }}