From a8d1a9e9b2015b7a9149fa72e254abec9fd7a285 Mon Sep 17 00:00:00 2001
From: Wojciech Kozlowski <wk@wojciechkozlowski.eu>
Date: Sun, 12 Feb 2023 12:38:26 +0100
Subject: [PATCH] Combine status with state update for start/stop

---
 playbooks/roles/services/start/tasks/main.yml | 20 ++++++-------------
 playbooks/roles/services/stop/tasks/main.yml  | 20 ++++++-------------
 2 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/playbooks/roles/services/start/tasks/main.yml b/playbooks/roles/services/start/tasks/main.yml
index 0a0e293..2a66321 100644
--- a/playbooks/roles/services/start/tasks/main.yml
+++ b/playbooks/roles/services/start/tasks/main.yml
@@ -4,18 +4,10 @@
     name: "services/include"
     vars_from: "user"
 
-- block:
-
-    - name: "enable pod-{{ services_service_name }}"
-      ansible.builtin.systemd:
-        name: "pod-{{ services_service_name }}.service"
-        enabled: true
-        scope: "user"
-
-    - name: "start pod-{{ services_service_name }}"
-      ansible.builtin.systemd:
-        name: "pod-{{ services_service_name }}.service"
-        state: "started"
-        scope: "user"
-
+- name: "enable and start pod-{{ services_service_name }}"
   become_user: "{{ services_service_user_name }}"
+  ansible.builtin.systemd:
+    name: "pod-{{ services_service_name }}.service"
+    enabled: true
+    state: "started"
+    scope: "user"
diff --git a/playbooks/roles/services/stop/tasks/main.yml b/playbooks/roles/services/stop/tasks/main.yml
index 55e69b7..1b4168d 100644
--- a/playbooks/roles/services/stop/tasks/main.yml
+++ b/playbooks/roles/services/stop/tasks/main.yml
@@ -4,18 +4,10 @@
     name: "services/include"
     vars_from: "user"
 
-- block:
-
-    - name: "stop pod-{{ services_service_name }}"
-      ansible.builtin.systemd:
-        name: "pod-{{ services_service_name }}.service"
-        state: "stopped"
-        scope: "user"
-
-    - name: "disable pod-{{ services_service_name }}"
-      ansible.builtin.systemd:
-        name: "pod-{{ services_service_name }}.service"
-        enabled: false
-        scope: "user"
-
+- name: "disable and stop pod-{{ services_service_name }}"
   become_user: "{{ services_service_user_name }}"
+  ansible.builtin.systemd:
+    name: "pod-{{ services_service_name }}.service"
+    enabled: false
+    state: "stopped"
+    scope: "user"