Browse Source

fix parameters for module replace in 0060-resolvconf (#7858)

pull/7867/head
Daniil Muidinov 3 years ago
committed by GitHub
parent
commit
7f309bb092
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
  1. 6
      roles/kubernetes/preinstall/tasks/0060-resolvconf.yml

6
roles/kubernetes/preinstall/tasks/0060-resolvconf.yml

@ -23,10 +23,9 @@
- name: Remove search/domain/nameserver options before block - name: Remove search/domain/nameserver options before block
replace: replace:
dest: "{{ item[0] }}" path: "{{ item[0] }}"
regexp: '^{{ item[1] }}[^#]*(?=# Ansible entries BEGIN)' regexp: '^{{ item[1] }}[^#]*(?=# Ansible entries BEGIN)'
backup: yes backup: yes
follow: yes
with_nested: with_nested:
- "{{ [resolvconffile, base|default(''), head|default('')] | difference(['']) }}" - "{{ [resolvconffile, base|default(''), head|default('')] | difference(['']) }}"
- [ 'search ', 'nameserver ', 'domain ', 'options ' ] - [ 'search ', 'nameserver ', 'domain ', 'options ' ]
@ -34,11 +33,10 @@
- name: Remove search/domain/nameserver options after block - name: Remove search/domain/nameserver options after block
replace: replace:
dest: "{{ item[0] }}" path: "{{ item[0] }}"
regexp: '(# Ansible entries END\n(?:(?!^{{ item[1] }}).*\n)*)(?:^{{ item[1] }}.*\n?)+' regexp: '(# Ansible entries END\n(?:(?!^{{ item[1] }}).*\n)*)(?:^{{ item[1] }}.*\n?)+'
replace: '\1' replace: '\1'
backup: yes backup: yes
follow: yes
with_nested: with_nested:
- "{{ [resolvconffile, base|default(''), head|default('')] | difference(['']) }}" - "{{ [resolvconffile, base|default(''), head|default('')] | difference(['']) }}"
- [ 'search ', 'nameserver ', 'domain ', 'options ' ] - [ 'search ', 'nameserver ', 'domain ', 'options ' ]

|||||||
100:0
Loading…
Cancel
Save