Refactored to tasks as per review comments

Signed-off-by: Peter Klijn <[email protected]>
k3s-io · Jul 13, 2024 · 9325d9d · 9325d9d
1 parent 4c31a36
commit 9325d9d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 10 deletions.
diff --git a/roles/k3s_server/handlers/main.yml b/roles/k3s_server/handlers/main.yml
diff --git a/roles/k3s_server/tasks/main.yml b/roles/k3s_server/tasks/main.yml
@@ -65,7 +65,7 @@
         owner: root
         group: root
         mode: "0644"
-      notify: Restart K3s Server
+      register: service_file_single
 
     - name: Copy K3s service file [HA]
       when:
@@ -77,7 +77,7 @@
         owner: root
         group: root
         mode: "0644"
-      notify: Restart K3s Server
+      register: service_file_ha
 
     - name: Add service environment variables
       when: extra_service_envs is defined
@@ -86,7 +86,18 @@
         line: "{{ item }}"
       with_items: "{{ extra_service_envs }}"
 
+    - name: Restart K3s service
+      when:
+        - ansible_facts.services['k3s.service'] is defined
+        - ansible_facts.services['k3s.service'].state == 'running'
+        - service_file_single.changed or service_file_ha.changed
+      ansible.builtin.systemd:
+        name: k3s
+        daemon_reload: true
+        state: restarted
+
     - name: Enable and check K3s service
+      when: ansible_facts.services['k3s.service'] is not defined or ansible_facts.services['k3s.service'].state != 'running'
       ansible.builtin.systemd:
         name: k3s
         daemon_reload: true
@@ -161,7 +172,7 @@
         owner: root
         group: root
         mode: "0644"
-      notify: Restart K3s Server
+      register: service_file_ha
 
     - name: Copy K3s service file [External DB]
       when:
@@ -173,9 +184,20 @@
         owner: root
         group: root
         mode: "0644"
-      notify: Restart K3s Server
+      register: service_file_external_db
+
+    - name: Restart K3s service
+      when:
+        - ansible_facts.services['k3s.service'] is defined
+        - ansible_facts.services['k3s.service'].state == 'running'
+        - service_file_ha.changed or service_file_external_db.changed
+      ansible.builtin.systemd:
+        name: k3s
+        daemon_reload: true
+        state: restarted
 
     - name: Enable and check K3s service
+      when: ansible_facts.services['k3s.service'] is not defined or ansible_facts.services['k3s.service'].state != 'running'
       ansible.builtin.systemd:
         name: k3s
         daemon_reload: true