From 4953e456835f707ab1b7382749a8749644a3ae9e Mon Sep 17 00:00:00 2001 From: Major Hayden Date: Thu, 15 Feb 2018 08:40:04 -0600 Subject: [PATCH] Remove systemd conditionals All operating systems supported by the role have systemd. Change-Id: Ic74f1de9fb65b0b6231e0d94431a71aaa28aa67a --- handlers/main.yml | 4 ++-- tasks/main.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/handlers/main.yml b/handlers/main.yml index b722746c..597ea950 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -18,7 +18,7 @@ name: "{{ item.service_name }}" enabled: yes state: "stopped" - daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}" + daemon_reload: yes with_items: "{{ filtered_neutron_services }}" register: _stop until: _stop | success @@ -79,7 +79,7 @@ name: "{{ item.service_name }}" enabled: yes state: "started" - daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}" + daemon_reload: yes with_items: "{{ filtered_neutron_services }}" register: _start until: _start | success diff --git a/tasks/main.yml b/tasks/main.yml index 5d091876..87a0330e 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -83,7 +83,7 @@ tags: - neutron-config -- include_tasks: "neutron_init_{{ ansible_service_mgr }}.yml" +- include_tasks: neutron_init_systemd.yml tags: - neutron-config