From 9b6808245428d8e63b21bd58056c3bce8d6e1a0e Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <noonedeadpunk@ya.ru>
Date: Sun, 18 Jul 2021 12:25:36 +0300
Subject: [PATCH] Run handlers only against present services

Handlers should run only against list of the filtered services
instead of the doing kind of filtering with conditions which might be
not correct and consistent.

Change-Id: I822208b43af64314e678dae097411a0fc402704a
---
 handlers/main.yml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/handlers/main.yml b/handlers/main.yml
index d694bfb..17a8a3d 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -15,12 +15,11 @@
 
 - name: Stop services
   service:
-    name: "{{ item.value.service_name }}"
-    enabled: yes
+    name: "{{ item.service_name }}"
+    enabled: "{{ item.service_enabled | bool }}"
     state: "stopped"
-    daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
-  with_dict: "{{ adjutant_services }}"
-  when: inventory_hostname in groups[item.value.group]
+    daemon_reload: yes
+  with_items: "{{ filtered_adjutant_services }}"
   register: _stop
   until: _stop is success
   retries: 5
@@ -30,14 +29,13 @@
 
 - name: Start services
   service:
-    name: "{{ item.value.service_name }}"
+    name: "{{ item.service_name }}"
     enabled: yes
     state: "started"
-    daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
-  with_dict: "{{ adjutant_services }}"
+    daemon_reload: yes
+  with_items: "{{ filtered_adjutant_services }}"
   when:
-    - inventory_hostname in groups[item.value.group]
-    - item.value.service_enabled | bool
+    - item.service_enabled | bool
   register: _start
   until: _start is success
   retries: 5