From 6315372f72ae6b778e1a0f43566f0f829ac193bc Mon Sep 17 00:00:00 2001 From: Logan V Date: Wed, 9 Nov 2016 22:43:02 -0600 Subject: [PATCH] Use ansible_service_mgr fact This patch removes some extra tasks for detecting systemd and uses the fact instead. Partial-Bug: #1640125 Change-Id: I51477047118e2b9460b7f4af5aa6f819befc7f28 --- tasks/glance_init_common.yml | 6 ++++-- tasks/main.yml | 13 ------------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/tasks/glance_init_common.yml b/tasks/glance_init_common.yml index fc7d958c..f6eb25cb 100644 --- a/tasks/glance_init_common.yml +++ b/tasks/glance_init_common.yml @@ -14,10 +14,12 @@ # limitations under the License. - include: glance_init_upstart.yml - when: pid1_name == "init" + when: + - ansible_service_mgr == 'upstart' - include: glance_init_systemd.yml - when: pid1_name == "systemd" + when: + - ansible_service_mgr == 'systemd' - name: Load service service: diff --git a/tasks/main.yml b/tasks/main.yml index 92015b63..379fc2f8 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -25,19 +25,6 @@ tags: - always -- name: Check init system - command: cat /proc/1/comm - changed_when: false - register: _pid1_name - tags: - - always - -- name: Set the name of pid1 - set_fact: - pid1_name: "{{ _pid1_name.stdout }}" - tags: - - always - - include: glance_pre_install.yml tags: - glance-install