Use ansible_service_mgr fact

This patch removes some extra tasks for detecting systemd and uses
the  fact instead.

Partial-Bug: #1640125
Change-Id: I672596a8e0710c2d718e73393b8a3f3032f942dd
This commit is contained in:
Logan V 2016-11-09 22:48:46 -06:00 committed by Jesse Pretorius (odyssey4me)
parent 2d21424bb7
commit dccb0c903c
2 changed files with 4 additions and 16 deletions

View File

@ -13,20 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# Detect whether the init system is upstart of systemd.
- 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: Gather variables for each operating system
include_vars: "{{ item }}"
with_first_found:

View File

@ -15,11 +15,13 @@
- include: swift_init_upstart.yml
static: no
when: pid1_name == "init"
when:
- ansible_service_mgr == 'upstart'
- include: swift_init_systemd.yml
static: no
when: pid1_name == "systemd"
when:
- ansible_service_mgr == 'systemd'
- name: Load service
service: