Use ansible_service_mgr fact
This patch removes some extra tasks for detecting systemd and uses the fact instead. Partial-Bug: #1640125 Change-Id: Ic7ca1603681bf7837e7bf5945c8859b2830bbe74
This commit is contained in:
parent
1ee6c091f2
commit
7a05132ccc
@ -24,19 +24,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
|
||||
|
||||
- name: Get CPU info content and store as var
|
||||
command: cat /proc/cpuinfo
|
||||
register: cpuinfo_contents
|
||||
|
@ -14,10 +14,12 @@
|
||||
# limitations under the License.
|
||||
|
||||
- include: neutron_init_upstart.yml
|
||||
when: pid1_name == "init"
|
||||
when:
|
||||
- ansible_service_mgr == 'upstart'
|
||||
|
||||
- include: neutron_init_systemd.yml
|
||||
when: pid1_name == "systemd"
|
||||
when:
|
||||
- ansible_service_mgr == 'systemd'
|
||||
|
||||
- name: Load service
|
||||
service:
|
||||
|
Loading…
Reference in New Issue
Block a user