Use ansible_service_mgr fact
This patch removes some extra tasks for detecting systemd and uses the fact instead. Partial-Bug: #1640125 Change-Id: I6f3d383444fd6c6193217d22b21511ec81d5a5ec
This commit is contained in:
parent
4f1f7691be
commit
313c531f27
@ -20,19 +20,6 @@
|
||||
tags:
|
||||
- always
|
||||
|
||||
- name: Check init system
|
||||
command: cat /proc/1/comm
|
||||
register: _pid1_name
|
||||
changed_when: false
|
||||
tags:
|
||||
- always
|
||||
|
||||
- name: Set the name of pid1
|
||||
set_fact:
|
||||
pid1_name: "{{ _pid1_name.stdout }}"
|
||||
tags:
|
||||
- always
|
||||
|
||||
- include: sahara_pre_install.yml
|
||||
tags:
|
||||
- sahara-install
|
||||
|
@ -13,11 +13,13 @@
|
||||
|
||||
- include: sahara_init_upstart.yml
|
||||
static: no
|
||||
when: pid1_name == "init"
|
||||
when:
|
||||
- ansible_service_mgr == 'upstart'
|
||||
|
||||
- include: sahara_init_systemd.yml
|
||||
static: no
|
||||
when: pid1_name == "systemd"
|
||||
when:
|
||||
- ansible_service_mgr == 'systemd'
|
||||
|
||||
- name: Load service
|
||||
service:
|
||||
|
Loading…
x
Reference in New Issue
Block a user