External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-17 00:47:32 -02:30
Code Issues Packages Projects Releases Wiki Activity

support removing options in resolvconf with tab separator (#9304)

Browse Source
This commit is contained in:
Kei Kori
2022-09-24 02:42:27 +09:00
committed by GitHub
parent 726711513f
commit 467dc19cbd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/kubernetes/preinstall/tasks/0060-resolvconf.yml
View File

@@ -29,7 +29,7 @@
backup: "{{ not resolvconf_stat.stat.islnk }}" backup: "{{ not resolvconf_stat.stat.islnk }}"
with_nested: with_nested:
- "{{ [resolvconffile, base|default(''), head|default('')] | difference(['']) }}" - "{{ [resolvconffile, base|default(''), head|default('')] | difference(['']) }}"
- [ 'search ', 'nameserver ', 'domain ', 'options ' ] - [ 'search\s', 'nameserver\s', 'domain\s', 'options\s' ]
notify: Preinstall | propagate resolvconf to k8s components notify: Preinstall | propagate resolvconf to k8s components
- name: Remove search/domain/nameserver options after block - name: Remove search/domain/nameserver options after block
@@ -40,7 +40,7 @@
backup: "{{ not resolvconf_stat.stat.islnk }}" backup: "{{ not resolvconf_stat.stat.islnk }}"
with_nested: with_nested:
- "{{ [resolvconffile, base|default(''), head|default('')] | difference(['']) }}" - "{{ [resolvconffile, base|default(''), head|default('')] | difference(['']) }}"
- [ 'search ', 'nameserver ', 'domain ', 'options ' ] - [ 'search\s', 'nameserver\s', 'domain\s', 'options\s' ]
notify: Preinstall | propagate resolvconf to k8s components notify: Preinstall | propagate resolvconf to k8s components
- name: get temporary resolveconf cloud init file content - name: get temporary resolveconf cloud init file content