Skip to content
Snippets Groups Projects
Unverified Commit 7f309bb0 authored by Daniil Muidinov's avatar Daniil Muidinov Committed by GitHub
Browse files

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

parent e2b67b57
No related branches found
No related tags found
No related merge requests found
...@@ -23,10 +23,9 @@ ...@@ -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 @@ ...@@ -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 ' ]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment