Skip to content
Snippets Groups Projects
Commit 3cfb76e5 authored by Matthew Mosesohn's avatar Matthew Mosesohn Committed by GitHub
Browse files

Merge pull request #1146 from mattymo/resolvconf_optimize

Condense resolvconf sources before starting loop
parents 25bff851 a5206418
No related branches found
No related tags found
No related merge requests found
...@@ -28,9 +28,8 @@ ...@@ -28,9 +28,8 @@
backup: yes backup: yes
follow: yes follow: yes
with_nested: with_nested:
- "{{ [resolvconffile] + [base|default('')] + [head|default('')] }}" - "{{ [resolvconffile, base|default(''), head|default('')] | difference(['']) }}"
- [ 'search ', 'nameserver ', 'domain ', 'options ' ] - [ 'search ', 'nameserver ', 'domain ', 'options ' ]
when: item[0] != ""
notify: Preinstall | restart network notify: Preinstall | restart network
- name: Remove search/domain/nameserver options after block - name: Remove search/domain/nameserver options after block
...@@ -41,9 +40,8 @@ ...@@ -41,9 +40,8 @@
backup: yes backup: yes
follow: yes follow: yes
with_nested: with_nested:
- "{{ [resolvconffile] + [base|default('')] + [head|default('')] }}" - "{{ [resolvconffile, base|default(''), head|default('')] | difference(['']) }}"
- [ 'search ', 'nameserver ', 'domain ', 'options ' ] - [ 'search ', 'nameserver ', 'domain ', 'options ' ]
when: item[0] != ""
notify: Preinstall | restart network notify: Preinstall | restart network
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment