From 467dc19cbdc5362dcfeff8b9428ce5b196b25624 Mon Sep 17 00:00:00 2001 From: Kei Kori Date: Sat, 24 Sep 2022 02:42:27 +0900 Subject: [PATCH] support removing options in resolvconf with tab separator (#9304) --- roles/kubernetes/preinstall/tasks/0060-resolvconf.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/kubernetes/preinstall/tasks/0060-resolvconf.yml b/roles/kubernetes/preinstall/tasks/0060-resolvconf.yml index 0d0b66b00..4397cdd63 100644 --- a/roles/kubernetes/preinstall/tasks/0060-resolvconf.yml +++ b/roles/kubernetes/preinstall/tasks/0060-resolvconf.yml @@ -29,7 +29,7 @@ backup: "{{ not resolvconf_stat.stat.islnk }}" with_nested: - "{{ [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 - name: Remove search/domain/nameserver options after block @@ -40,7 +40,7 @@ backup: "{{ not resolvconf_stat.stat.islnk }}" with_nested: - "{{ [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 - name: get temporary resolveconf cloud init file content