C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1146 from mattymo/resolvconf_optimize

Browse source 
Condense resolvconf sources before starting loop
This commit is contained in:
Matthew Mosesohn 2017-03-17 18:42:32 +03:00 committed by GitHub
commit 3cfb76e57f
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
roles/kubernetes/preinstall/tasks/resolvconf.yml
View file

@ -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 @@
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