From 8a8d4d7ea2c0be6d1ab451f3b891bce4daf7cb69 Mon Sep 17 00:00:00 2001
From: Khue Doan <khuedoan98@gmail.com>
Date: Wed, 1 Sep 2021 05:35:35 +0700
Subject: [PATCH] Working k3s service and config

---
 metal/roles/k3s/handlers/main.yml        | 6 ++++++
 metal/roles/k3s/tasks/main.yml           | 2 +-
 metal/roles/k3s/templates/config.yaml.j2 | 7 ++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 metal/roles/k3s/handlers/main.yml

diff --git a/metal/roles/k3s/handlers/main.yml b/metal/roles/k3s/handlers/main.yml
new file mode 100644
index 00000000..8491971c
--- /dev/null
+++ b/metal/roles/k3s/handlers/main.yml
@@ -0,0 +1,6 @@
+- name: Restart k3s service
+  systemd:
+    name: k3s
+    daemon_reload: yes
+    enabled: yes
+    state: restarted
diff --git a/metal/roles/k3s/tasks/main.yml b/metal/roles/k3s/tasks/main.yml
index ec46c4eb..2b439ed2 100644
--- a/metal/roles/k3s/tasks/main.yml
+++ b/metal/roles/k3s/tasks/main.yml
@@ -40,7 +40,6 @@
     dest: "{{ k3s_token_file }}"
 
 - name: Copy k3s config files
-  when: "'masters' in group_names"
   template:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
@@ -49,5 +48,6 @@
       dest: "{{ k3s_config_file }}"
     - src: k3s.service.j2
       dest: "{{ k3s_service_file }}"
+  notify: Restart k3s service
 
 # Get kubeconfig /etc/rancher/k3s/k3s.yaml
diff --git a/metal/roles/k3s/templates/config.yaml.j2 b/metal/roles/k3s/templates/config.yaml.j2
index adbf009c..06169e9b 100644
--- a/metal/roles/k3s/templates/config.yaml.j2
+++ b/metal/roles/k3s/templates/config.yaml.j2
@@ -1 +1,6 @@
-{{ 'server' if 'masters' in group_names else 'agent' }}
+{% if inventory_hostname == groups['masters'][0] %}
+cluster-init: true
+{% else %}
+server: https://{{ hostvars[groups['masters'][0]].ansible_host }}:6443
+{% endif %}
+token-file: {{ k3s_token_file }}