From ff26ba21586db32c6143fa684532bbccbe5e5115 Mon Sep 17 00:00:00 2001
From: Major Hayden <major@mhtx.net>
Date: Thu, 15 Feb 2018 08:35:19 -0600
Subject: [PATCH] Remove systemd conditionals

All operating systems supported by the role have systemd and these
conditionals are no longer needed.

Change-Id: I35500f7eec993b2bcdb245a995a05cacf2c596f8
---
 handlers/main.yml                      | 6 +++---
 tasks/drivers/kvm/nova_disable_smt.yml | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/handlers/main.yml b/handlers/main.yml
index add7ac58..65343ee8 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -18,14 +18,14 @@
     name: "{{ libvirt_service_name }}"
     enabled: yes
     state: "restarted"
-    daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
+    daemon_reload: yes
 
 - name: Stop services
   service:
     name: "{{ item.service_name }}"
     enabled: yes
     state: "stopped"
-    daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
+    daemon_reload: yes
   with_items: "{{ filtered_nova_services }}"
   register: _stop
   until: _stop | success
@@ -56,7 +56,7 @@
     name: "{{ item.service_name }}"
     enabled: yes
     state: "started"
-    daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
+    daemon_reload: yes
   with_items: "{{ filtered_nova_services }}"
   register: _start
   until: _start | success
diff --git a/tasks/drivers/kvm/nova_disable_smt.yml b/tasks/drivers/kvm/nova_disable_smt.yml
index 0158486a..fc65de3f 100644
--- a/tasks/drivers/kvm/nova_disable_smt.yml
+++ b/tasks/drivers/kvm/nova_disable_smt.yml
@@ -29,7 +29,6 @@
     owner: "root"
     group: "root"
   when:
-    - ansible_service_mgr == 'systemd'
     - smt_disable_result.rc is defined
     - smt_disable_result.rc == 0
   register: smt_disable_service