openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Use ansible_service_mgr fact

Browse Source 
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:
Logan V 2016-11-09 22:46:03 -06:00 committed by Jesse Pretorius (odyssey4me)
parent 1ee6c091f2
commit 7a05132ccc
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tasks/main.yml
View File

@ -24,19 +24,6 @@
tags: tags:
- always - 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 - name: Get CPU info content and store as var
command: cat /proc/cpuinfo command: cat /proc/cpuinfo
register: cpuinfo_contents register: cpuinfo_contents

6
tasks/neutron_init_common.yml
View File

@ -14,10 +14,12 @@
# limitations under the License. # limitations under the License.
- include: neutron_init_upstart.yml - include: neutron_init_upstart.yml
when: pid1_name == "init" when:
- ansible_service_mgr == 'upstart'
- include: neutron_init_systemd.yml - include: neutron_init_systemd.yml
when: pid1_name == "systemd" when:
- ansible_service_mgr == 'systemd'
- name: Load service - name: Load service
service: service: