From cd725780f5a58bb8a51c53ed625501ab3e5af475 Mon Sep 17 00:00:00 2001
From: Nicholas Malcolm <bubylou7@gmail.com>
Date: Mon, 30 Jan 2023 21:15:26 -0500
Subject: [PATCH] Move k3s_server_location to inventory vars

- All environemt variables are now in one place
- Add --data-dir option to agent and init  service

Signed-off-by: Derek Nola <derek.nola@suse.com>
---
 inventory-sample.yml                           | 1 +
 roles/k3s/agent/templates/k3s-agent.service.j2 | 2 +-
 roles/k3s/server/defaults/main.yml             | 2 --
 roles/k3s/server/tasks/main.yml                | 7 ++++---
 roles/reset/tasks/main.yml                     | 7 +------
 5 files changed, 7 insertions(+), 12 deletions(-)
 delete mode 100644 roles/k3s/server/defaults/main.yml

diff --git a/inventory-sample.yml b/inventory-sample.yml
index c39a16d..c32a10b 100644
--- a/inventory-sample.yml
+++ b/inventory-sample.yml
@@ -13,6 +13,7 @@ k3s_cluster:
     ansible_port: 22
     ansible_user: debian
     k3s_version: v1.25.5+k3s2
+    k3s_server_location: /var/lib/rancher/k3s
     systemd_dir: /etc/systemd/system
     api_endpoint: "{{ hostvars[groups['server'][0]]['ansible_host'] | default(groups['server'][0]) }}"
     api_port: 6443
diff --git a/roles/k3s/agent/templates/k3s-agent.service.j2 b/roles/k3s/agent/templates/k3s-agent.service.j2
index 6e11284..b4a331d 100644
--- a/roles/k3s/agent/templates/k3s-agent.service.j2
+++ b/roles/k3s/agent/templates/k3s-agent.service.j2
@@ -7,7 +7,7 @@ After=network-online.target
 Type=notify
 ExecStartPre=-/sbin/modprobe br_netfilter
 ExecStartPre=-/sbin/modprobe overlay
-ExecStart=/usr/local/bin/k3s agent --server https://{{ api_endpoint }}:{{ api_port }} --token {{ hostvars[groups['server'][0]]['token'] }} {{ extra_agent_args | default("") }}
+ExecStart=/usr/local/bin/k3s agent --data-dir {{ k3s_server_location }} --server https://{{ api_endpoint }}:{{ api_port }} --token {{ hostvars[groups['server'][0]]['token'] }} {{ extra_agent_args | default("") }}
 KillMode=process
 Delegate=yes
 # Having non-zero Limit*s causes performance problems due to accounting overhead
diff --git a/roles/k3s/server/defaults/main.yml b/roles/k3s/server/defaults/main.yml
deleted file mode 100644
index c56778f..0000000
--- a/roles/k3s/server/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-k3s_server_location: /var/lib/rancher/k3s
diff --git a/roles/k3s/server/tasks/main.yml b/roles/k3s/server/tasks/main.yml
index 2c4c521..116bfad 100644
--- a/roles/k3s/server/tasks/main.yml
+++ b/roles/k3s/server/tasks/main.yml
@@ -10,7 +10,8 @@
       ansible.builtin.command:
         cmd: >
           systemd-run -p RestartSec=2 -p Restart=on-failure --unit=k3s-init k3s server
-          --cluster-init --tls-san {{ api_endpoint }} {{ extra_server_args | default('') }}
+          --cluster-init --tls-san {{ api_endpoint }} --data-dir {{ k3s_server_location }}
+          {{ extra_server_args | default('') }}
         creates: "{{ systemd_dir }}/k3s-init.service"
       when: groups['server'] | length > 1
 
@@ -18,7 +19,7 @@
       ansible.builtin.command:
         cmd: >
           systemd-run -p RestartSec=2 -p Restart=on-failure --unit=k3s-init k3s server
-           --tls-san {{ api_endpoint }} { extra_server_args | default('') }}
+           --tls-san {{ api_endpoint }} --data-dir {{ k3s_server_location }} { extra_server_args | default('') }}
         creates: "{{ systemd_dir }}/k3s-init.service"
       when: groups['server'] | length == 1
 
@@ -84,7 +85,7 @@
     cmd: >
       systemd-run -p RestartSec=2 -p Restart=on-failure --unit=k3s-init k3s server --token "{{ hostvars[groups['server'][0]]['token'] }}"
       --server https://{{ hostvars[groups['server'][0]]['ansible_host'] | default(groups['server'][0]) }}:{{ api_port }}
-          {{ extra_server_args | default('') }}
+      --data-dir {{ k3s_server_location }} {{ extra_server_args | default('') }}
     creates: "{{ systemd_dir }}/k3s-init.service"
   when: ansible_hostname != groups['server'][0]
 
diff --git a/roles/reset/tasks/main.yml b/roles/reset/tasks/main.yml
index b9de7a6..98a5645 100644
--- a/roles/reset/tasks/main.yml
+++ b/roles/reset/tasks/main.yml
@@ -1,9 +1,4 @@
 ---
-- name: Clean previous runs of k3s-init
-  command: systemctl reset-failed k3s-init
-  failed_when: false
-  changed_when: false
-
 - name: Disable services
   ansible.builtin.systemd:
     name: "{{ item }}"
@@ -40,7 +35,7 @@
     - "{{ systemd_dir }}/k3s-agent.service"
     - /etc/rancher/k3s
     - /var/lib/kubelet
-    - /var/lib/rancher/k3s
+    - "{{ k3s_server_location }}"
 
 - name: Systemd daemon reload
   ansible.builtin.systemd: