diff --git a/roles/dnsmasq/defaults/main.yml b/roles/dnsmasq/defaults/main.yml new file mode 100644 index 000000000..48b52c121 --- /dev/null +++ b/roles/dnsmasq/defaults/main.yml @@ -0,0 +1,12 @@ +--- +# 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 new file mode 100644 index 000000000..95cd80cfc --- /dev/null +++ b/roles/dnsmasq/handlers/main.yml @@ -0,0 +1,10 @@ +- 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 526e162ae..e8dc78aa8 100644 --- a/roles/dnsmasq/tasks/main.yml +++ b/roles/dnsmasq/tasks/main.yml @@ -68,9 +68,17 @@ 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 {{ [ 'default.svc.' + dns_domain, 'svc.' + dns_domain, dns_domain ] | join(' ') }}" + line: "search {{searchentries}}" dest: "{{resolvconffile}}" state: present insertbefore: BOF @@ -79,12 +87,13 @@ - name: Add local dnsmasq to resolv.conf lineinfile: - line: "nameserver {{dns_server}}" + line: "nameserver {{item}}" dest: "{{resolvconffile}}" state: present insertafter: "^search.*$" backup: yes follow: yes + with_items: "{{nameserverentries}}" - name: Add options to resolv.conf lineinfile: @@ -100,11 +109,13 @@ - attempts:2 - name: disable resolv.conf modification by dhclient - copy: src=dhclient_nodnsupdate dest=/etc/dhcp/dhclient-enter-hooks.d/nodnsupdate mode=0755 backup=yes + copy: src=dhclient_nodnsupdate dest=/etc/dhcp/dhclient-enter-hooks.d/znodnsupdate mode=0755 backup=yes + notify: Dnsmasq | restart network when: ansible_os_family == "Debian" - name: disable resolv.conf modification by dhclient - copy: src=dhclient_nodnsupdate dest=/etc/dhcp/dhclient.d/nodnsupdate mode=u+x backup=yes + copy: src=dhclient_nodnsupdate dest=/etc/dhcp/dhclient.d/znodnsupdate mode=u+x backup=yes + notify: Dnsmasq | restart network when: ansible_os_family == "RedHat" - name: update resolvconf