diff options
| author | Michael Gugino <gugino.michael@yahoo.com> | 2017-10-27 09:02:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-27 09:02:21 -0400 |
| commit | a928c53657b689085cc2a6a14808d285e62e2984 (patch) | |
| tree | 34cb591664a4a49b651828ec95c70ea78b1c5391 | |
| parent | 36767b4902e496e2b2f217c374853eede7b44d79 (diff) | |
| parent | db50b11f29ee95fa6128257141bba9c39fe36de3 (diff) | |
| download | openshift-a928c53657b689085cc2a6a14808d285e62e2984.tar.gz openshift-a928c53657b689085cc2a6a14808d285e62e2984.tar.bz2 openshift-a928c53657b689085cc2a6a14808d285e62e2984.tar.xz openshift-a928c53657b689085cc2a6a14808d285e62e2984.zip | |
Merge pull request #5891 from mgugino-upstream-stage/dns-bind-interfaces
Change dnsmasq to bind-interfaces + except-interfaces
| -rw-r--r-- | roles/openshift_node_dnsmasq/defaults/main.yml | 5 | ||||
| -rw-r--r-- | roles/openshift_node_dnsmasq/templates/origin-dns.conf.j2 | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/roles/openshift_node_dnsmasq/defaults/main.yml b/roles/openshift_node_dnsmasq/defaults/main.yml index eae832fcf..ebcff46b5 100644 --- a/roles/openshift_node_dnsmasq/defaults/main.yml +++ b/roles/openshift_node_dnsmasq/defaults/main.yml @@ -1,2 +1,7 @@ --- openshift_node_dnsmasq_install_network_manager_hook: true + +# lo must always be present in this list or dnsmasq will conflict with +# the node's dns service. +openshift_node_dnsmasq_except_interfaces: +- lo diff --git a/roles/openshift_node_dnsmasq/templates/origin-dns.conf.j2 b/roles/openshift_node_dnsmasq/templates/origin-dns.conf.j2 index ef3ba2880..5c9601277 100644 --- a/roles/openshift_node_dnsmasq/templates/origin-dns.conf.j2 +++ b/roles/openshift_node_dnsmasq/templates/origin-dns.conf.j2 @@ -4,4 +4,7 @@ no-negcache max-cache-ttl=1 enable-dbus bind-interfaces -listen-address={{ openshift.node.dns_ip }} +{% for interface in openshift_node_dnsmasq_except_interfaces %} +except-interface={{ interface }} +{% endfor %} +# End of config |