From 7f309bb092e7d6eeeb39f6cf534e63192fcc1ae9 Mon Sep 17 00:00:00 2001
From: Daniil Muidinov <mdan1@yandex.ru>
Date: Wed, 11 Aug 2021 03:13:26 +0300
Subject: [PATCH] fix parameters for module replace in 0060-resolvconf (#7858)
---
roles/kubernetes/preinstall/tasks/0060-resolvconf.yml | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/roles/kubernetes/preinstall/tasks/0060-resolvconf.yml b/roles/kubernetes/preinstall/tasks/0060-resolvconf.yml
index 332f49d86..263e38509 100644
--- a/roles/kubernetes/preinstall/tasks/0060-resolvconf.yml
+++ b/roles/kubernetes/preinstall/tasks/0060-resolvconf.yml
@@ -23,10 +23,9 @@
- name: Remove search/domain/nameserver options before block
replace:
- dest: "{{ item[0] }}"
+ path: "{{ item[0] }}"
regexp: '^{{ item[1] }}[^#]*(?=# Ansible entries BEGIN)'
backup: yes
- follow: yes
with_nested:
- "{{ [resolvconffile, base|default(''), head|default('')] | difference(['']) }}"
- [ 'search ', 'nameserver ', 'domain ', 'options ' ]
@@ -34,11 +33,10 @@
- name: Remove search/domain/nameserver options after block
replace:
- dest: "{{ item[0] }}"
+ path: "{{ item[0] }}"
regexp: '(# Ansible entries END\n(?:(?!^{{ item[1] }}).*\n)*)(?:^{{ item[1] }}.*\n?)+'
replace: '\1'
backup: yes
- follow: yes
with_nested:
- "{{ [resolvconffile, base|default(''), head|default('')] | difference(['']) }}"
- [ 'search ', 'nameserver ', 'domain ', 'options ' ]
--
GitLab