kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Condense resolvconf sources before starting loop

pull/1146/head
Matthew Mosesohn 2017-03-16 17:58:17 +03:00
parent b4a1ba828a
commit a52064184e
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