Make resolvconf preinstall idempotent

roles/kubernetes/preinstall/tasks/resolvconf.yml

@@ -3,25 +3,16 @@
   command: cp -f /etc/resolv.conf "{{ resolvconffile }}"
   when: ansible_os_family in ["CoreOS", "Container Linux by CoreOS"]
 
-- name: Remove search/domain/nameserver options
+- name: Add domain/search/nameservers/options to resolv.conf
-  lineinfile:
-    dest: "{{item[0]}}"
-    state: absent
-    regexp: "^{{ item[1] }}.*$"
-    backup: yes
-    follow: yes
-  with_nested:
-    - "{{ [resolvconffile] + [base|default('')] + [head|default('')] }}"
-    - [ 'search ', 'nameserver ', 'domain ', 'options ' ]
-  notify: Preinstall | restart network
-
-- name: Add domain/search/nameservers to resolv.conf
   blockinfile:
     dest: "{{resolvconffile}}"
     block: |-
       {% for item in [domainentry] + [searchentries] + nameserverentries.split(',') -%}
       {{ item }}
       {% endfor %}
+      options ndots:{{ ndots }}
+      options timeout:2
+      options attempts:2
     state: present
     insertbefore: BOF
     create: yes
@@ -30,21 +21,32 @@
     marker: "# Ansible entries {mark}"
   notify: Preinstall | restart network
 
-- name: Add options to resolv.conf
+- name: Remove search/domain/nameserver options before block
-  lineinfile:
+  replace:
-    line: options {{ item }}
+    dest: "{{item[0]}}"
-    dest: "{{resolvconffile}}"
+    regexp: '^{{ item[1] }}[^#]*(?=# Ansible entries BEGIN)'
-    state: present
-    regexp: "^options.*{{ item }}$"
-    insertafter: EOF
     backup: yes
     follow: yes
-  with_items:
+  with_nested:
-    - ndots:{{ ndots }}
+    - "{{ [resolvconffile] + [base|default('')] + [head|default('')] }}"
-    - timeout:2
+    - [ 'search ', 'nameserver ', 'domain ', 'options ' ]
-    - attempts:2
+  when: item[0] != ""
   notify: Preinstall | restart network
 
+- name: Remove search/domain/nameserver options after block
+  replace:
+    dest: "{{item[0]}}"
+    regexp: '(# Ansible entries END\n(?:(?!^{{ item[1] }}).*\n)*)(?:^{{ item[1] }}.*\n?)+'
+    replace: '\1'
+    backup: yes
+    follow: yes
+  with_nested:
+    - "{{ [resolvconffile] + [base|default('')] + [head|default('')] }}"
+    - [ 'search ', 'nameserver ', 'domain ', 'options ' ]
+  when: item[0] != ""
+  notify: Preinstall | restart network
+
+
 - name: get temporary resolveconf cloud init file content
   command: cat {{ resolvconffile }}
   register: cloud_config