From a2bfc6c0b157b6100db24980a70d01de1ad49c37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Hasprai?= Date: Tue, 7 Nov 2023 15:20:41 +0100 Subject: [PATCH 1/3] Fix http_proxy service dir in k3s_agent role --- roles/k3s_agent/tasks/http_proxy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/k3s_agent/tasks/http_proxy.yml b/roles/k3s_agent/tasks/http_proxy.yml index f0a68f6..d4943e2 100644 --- a/roles/k3s_agent/tasks/http_proxy.yml +++ b/roles/k3s_agent/tasks/http_proxy.yml @@ -1,8 +1,8 @@ --- -- name: Create k3s.service.d directory +- name: Create k3s-node.service.d directory file: - path: '{{ systemd_dir }}/k3s.service.d' + path: '{{ systemd_dir }}/k3s-node.service.d' state: directory owner: root group: root @@ -12,7 +12,7 @@ - name: Copy K3s http_proxy conf file template: src: "http_proxy.conf.j2" - dest: "{{ systemd_dir }}/k3s.service.d/http_proxy.conf" + dest: "{{ systemd_dir }}/k3s-node.service.d/http_proxy.conf" owner: root group: root mode: '0755' From 83d4ee27fd617f2e9bb6021c70dcf3a7d00a115c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Hasprai?= Date: Tue, 7 Nov 2023 18:03:28 +0100 Subject: [PATCH 2/3] Fix http_proxy reset: rm conf files before dirs --- roles/reset/tasks/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/reset/tasks/main.yml b/roles/reset/tasks/main.yml index d75c9ff..96f7b4a 100644 --- a/roles/reset/tasks/main.yml +++ b/roles/reset/tasks/main.yml @@ -51,8 +51,10 @@ name: "{{ item }}" state: absent with_items: + - "{{ systemd_dir }}/k3s.service.d/http_proxy.conf" - "{{ systemd_dir }}/k3s.service.d" - "{{ systemd_dir }}/k3s-node.service.d" + - "{{ systemd_dir }}/k3s-node.service.d/http_proxy.conf" when: proxy_env is defined - name: Reload daemon_reload From ef8fe53062a925f33d2e957ccf108580ac3e02f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Hasprai?= Date: Tue, 7 Nov 2023 18:04:37 +0100 Subject: [PATCH 3/3] Fix http_proxy reset rm order --- roles/reset/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/reset/tasks/main.yml b/roles/reset/tasks/main.yml index 96f7b4a..7de690c 100644 --- a/roles/reset/tasks/main.yml +++ b/roles/reset/tasks/main.yml @@ -53,8 +53,8 @@ with_items: - "{{ systemd_dir }}/k3s.service.d/http_proxy.conf" - "{{ systemd_dir }}/k3s.service.d" - - "{{ systemd_dir }}/k3s-node.service.d" - "{{ systemd_dir }}/k3s-node.service.d/http_proxy.conf" + - "{{ systemd_dir }}/k3s-node.service.d" when: proxy_env is defined - name: Reload daemon_reload