소스 검색

Change dnsmasq to bind-interfaces + except-interfaces

Currently, we have to set the listen ip for dnsmasq via ansible
during installation.

This commit enables dnsmasq to bind-interfaces + exclude interfaces
to ensure dnsmasq doesn't listen on lo interface.
Michael Gugino 7 년 전
부모
커밋
db50b11f29
2개의 변경된 파일9개의 추가작업 그리고 1개의 파일을 삭제
  1. 5 0
      roles/openshift_node_dnsmasq/defaults/main.yml
  2. 4 1
      roles/openshift_node_dnsmasq/templates/origin-dns.conf.j2

+ 5 - 0
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

+ 4 - 1
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