From 33c8d0a1a7155030a041688703567f12a4ef8352 Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <mmosesohn@mirantis.com>
Date: Tue, 30 Aug 2016 13:00:19 +0300
Subject: [PATCH] Remove search and nameserver entries from resolvconf base
These items conflict when they are provided also in head file
Fixes: #456
---
roles/dnsmasq/tasks/main.yml | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/roles/dnsmasq/tasks/main.yml b/roles/dnsmasq/tasks/main.yml
index 51f02aa9e..194214684 100644
--- a/roles/dnsmasq/tasks/main.yml
+++ b/roles/dnsmasq/tasks/main.yml
@@ -108,6 +108,18 @@
- timeout: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
copy: src=dhclient_nodnsupdate dest=/etc/dhcp/dhclient-enter-hooks.d/znodnsupdate mode=0755
notify: Dnsmasq | restart network
--
GitLab