From 643b28f9d3524cb213dcd186be7bfebdfda4c5bb Mon Sep 17 00:00:00 2001
From: Smana <smainklh@gmail.com>
Date: Wed, 24 Aug 2016 12:36:25 +0200
Subject: [PATCH] Revert "Fix resolv.conf search/nameserver"
This reverts commit 977f82c32c3e92155538af87842e6b4fb3a59141.
---
roles/dnsmasq/defaults/main.yml | 12 ------------
roles/dnsmasq/handlers/main.yml | 10 ----------
roles/dnsmasq/tasks/main.yml | 19 ++++---------------
3 files changed, 4 insertions(+), 37 deletions(-)
delete mode 100644 roles/dnsmasq/defaults/main.yml
delete mode 100644 roles/dnsmasq/handlers/main.yml
diff --git a/roles/dnsmasq/defaults/main.yml b/roles/dnsmasq/defaults/main.yml
deleted file mode 100644
index 48b52c121..000000000
--- a/roles/dnsmasq/defaults/main.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-# Existing search/nameserver resolvconf entries will be purged and
-# ensured by this additional data:
-
-# Max of 4 names is allowed and no more than 256 - 17 chars total
-# (a 2 is reserved for the 'default.svc.' and'svc.')
-#searchdomains:
-# - foo.bar.lc
-
-# Max of 2 is allowed here (a 1 is reserved for the dns_server)
-#nameservers:
-# - 127.0.0.1
diff --git a/roles/dnsmasq/handlers/main.yml b/roles/dnsmasq/handlers/main.yml
deleted file mode 100644
index 95cd80cfc..000000000
--- a/roles/dnsmasq/handlers/main.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-- name: Dnsmasq | restart network
- service:
- name: >-
- {% if ansible_os_family == "RedHat" -%}
- network
- {%- elif ansible_os_family == "Debian" -%}
- networking
- {%- endif %}
- state: restarted
- when: ansible_os_family != "CoreOS"
diff --git a/roles/dnsmasq/tasks/main.yml b/roles/dnsmasq/tasks/main.yml
index e8dc78aa8..526e162ae 100644
--- a/roles/dnsmasq/tasks/main.yml
+++ b/roles/dnsmasq/tasks/main.yml
@@ -68,17 +68,9 @@
resolvconffile: >-
{%- if resolvconf.rc == 0 -%}/etc/resolvconf/resolv.conf.d/head{%- else -%}/etc/resolv.conf{%- endif -%}
-- name: generate search domains to resolvconf
- set_fact:
- searchentries="{{ ([ 'default.svc.' + dns_domain, 'svc.' + dns_domain ] + searchdomains|default([])) | join(' ') }}"
-
-- name: generate nameservers to resolvconf
- set_fact:
- nameserverentries="{{ nameservers|default([]) + [ dns_server ] }}"
-
- name: Add search resolv.conf
lineinfile:
- line: "search {{searchentries}}"
+ line: "search {{ [ 'default.svc.' + dns_domain, 'svc.' + dns_domain, dns_domain ] | join(' ') }}"
dest: "{{resolvconffile}}"
state: present
insertbefore: BOF
@@ -87,13 +79,12 @@
- name: Add local dnsmasq to resolv.conf
lineinfile:
- line: "nameserver {{item}}"
+ line: "nameserver {{dns_server}}"
dest: "{{resolvconffile}}"
state: present
insertafter: "^search.*$"
backup: yes
follow: yes
- with_items: "{{nameserverentries}}"
- name: Add options to resolv.conf
lineinfile:
@@ -109,13 +100,11 @@
- attempts:2
- name: disable resolv.conf modification by dhclient
- copy: src=dhclient_nodnsupdate dest=/etc/dhcp/dhclient-enter-hooks.d/znodnsupdate mode=0755 backup=yes
- notify: Dnsmasq | restart network
+ copy: src=dhclient_nodnsupdate dest=/etc/dhcp/dhclient-enter-hooks.d/nodnsupdate mode=0755 backup=yes
when: ansible_os_family == "Debian"
- name: disable resolv.conf modification by dhclient
- copy: src=dhclient_nodnsupdate dest=/etc/dhcp/dhclient.d/znodnsupdate mode=u+x backup=yes
- notify: Dnsmasq | restart network
+ copy: src=dhclient_nodnsupdate dest=/etc/dhcp/dhclient.d/nodnsupdate mode=u+x backup=yes
when: ansible_os_family == "RedHat"
- name: update resolvconf
--
GitLab