Merge pull request #458 from kubespray/issue456

Remove search and nameserver entries from resolvconf base
This commit is contained in:
Smaine Kahlouch 2016-08-31 13:15:30 +02:00 committed by GitHub
commit 41ed8bcabd

View file

@ -108,6 +108,18 @@
- timeout:2 - timeout:2
- attempts:2 - attempts:2
- name: Remove search and nameserver options from resolvconf base
lineinfile:
dest: /etc/resolvconf/resolv.conf.d/base
state: absent
regexp: "^{{ item }}.*$"
backup: yes
follow: yes
with_items:
- search
- nameserver
when: resolvconf.rc == 0
- name: disable resolv.conf modification by dhclient - name: disable resolv.conf modification by dhclient
copy: src=dhclient_nodnsupdate dest=/etc/dhcp/dhclient-enter-hooks.d/znodnsupdate mode=0755 copy: src=dhclient_nodnsupdate dest=/etc/dhcp/dhclient-enter-hooks.d/znodnsupdate mode=0755
notify: Dnsmasq | restart network notify: Dnsmasq | restart network