Merge pull request #501 from kubespray/nameserver_update_fix

Improve management of nameservers in resolv.conf

roles/dnsmasq/tasks/main.yml

@@ -86,14 +86,17 @@
     follow: yes
 
 - name: Add local dnsmasq to resolv.conf
-  lineinfile:
-    line: "nameserver {{item}}"
+  blockinfile:
     dest: "{{resolvconffile}}"
+    block: |-
+      {% for item in nameserverentries -%}
+      nameserver {{ item }}
+      {% endfor %}
     state: present
-    insertafter: "^search.*$"
+    create: yes
     backup: yes
     follow: yes
-  with_items: "{{nameserverentries}}"
+    marker: "# Ansible nameservers {mark}"
 
 - name: Add options to resolv.conf
   lineinfile: