Add domain + search to dhclient.conf and transform dns_searchs into list

defaults/main.yml

@@ -1,5 +1,10 @@
 ---
 dns_nameservers: ['8.8.8.8', '8.8.4.4']
 dns_remove_resolvconf: true
-#dns_searchs: ""
+dns_domain: "localdomain"
+dns_searchs: 
+   - "{{dns_domain}}"
 dns_dhclient_rule: "supersede" # can be supersede or prepend
+
+dns_dhclient_file: "/etc/dhcp/dhclient.conf"
+dns_forced_in_dhclientconf: "{{ansible_distribution == 'Ubuntu'}}"

tasks/main.yml

@@ -10,9 +10,13 @@
 
 - name: Ensure dns servers are configured in dhclient.conf
   lineinfile: >
-     regexp="(supersede|prepend) domain-name-servers"
-     line="{{dns_dhclient_rule}} domain-name-servers {% for nameserver in dns_nameservers %}{{nameserver}}{% if not loop.last %},{% endif %}{% endfor %};"  
-     dest=/etc/dhcp/dhclient.conf
+     regexp="#?(supersede|prepend) {{item.name}} "
+     line="{{dns_dhclient_rule}} {{item.name}} {{item.value}};"  
+     dest="{{dns_dhclient_file}}"
      state=present
-  when: ansible_distribution == "Ubuntu"
+  with_items:
+    - { name: 'domain-name-servers', value: '{% for nameserver in dns_nameservers %}{{nameserver}}{% if not loop.last %},{% endif %}{% endfor %}' }
+    - { name: 'domain-name', value: '\"{{dns_domain}}\"' }
+    - { name: 'domain-search', value: '{% for domainsearch in dns_searchs %}\"{{domainsearch}}\"{% if not loop.last %}, {% endif %}{% endfor %}' }
+  when:  dns_forced_in_dhclientconf and item.value != ""
   tags: [configuration,dns]

templates/resolv.conf.j2

@@ -6,5 +6,5 @@ domain {{dns_domain}}
 nameserver {{nameserver}}
 {% endfor %}
 {% if dns_searchs is defined %}
-search {{dns_searchs}}
+search {% for name in dns_searchs %}{{name}} {% endfor %}
 {% endif %}