Skip to content

Commit

Permalink
fix parameters for module replace in 0060-resolvconf (kubernetes-sigs…
Browse files Browse the repository at this point in the history
  • Loading branch information
DANic-git authored Aug 11, 2021
1 parent e2b67b5 commit 7f309bb
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions roles/kubernetes/preinstall/tasks/0060-resolvconf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,20 @@

- name: Remove search/domain/nameserver options before block
replace:
dest: "{{ item[0] }}"
path: "{{ item[0] }}"
regexp: '^{{ item[1] }}[^#]*(?=# Ansible entries BEGIN)'
backup: yes
follow: yes
with_nested:
- "{{ [resolvconffile, base|default(''), head|default('')] | difference(['']) }}"
- [ 'search ', 'nameserver ', 'domain ', 'options ' ]
notify: Preinstall | propagate resolvconf to k8s components

- name: Remove search/domain/nameserver options after block
replace:
dest: "{{ item[0] }}"
path: "{{ 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('')] | difference(['']) }}"
- [ 'search ', 'nameserver ', 'domain ', 'options ' ]
Expand Down

0 comments on commit 7f309bb

Please sign in to comment.