use ansible_service_mgr to detect init system

This commit is contained in:
Smana
2016-02-13 11:17:20 +01:00
parent 7fef64dacd
commit a649aa8b7e
17 changed files with 30 additions and 48 deletions

View File

@@ -13,7 +13,7 @@
- name : reload systemd
shell: systemctl daemon-reload
when: init_system == "systemd"
when: ansible_service_mgr == "systemd"
- name: reload docker
service:

View File

@@ -47,6 +47,6 @@
src: systemd-docker.service
dest: /lib/systemd/system/docker.service
notify: restart docker
when: init_system == "systemd"
when: ansible_service_mgr == "systemd"
- meta: flush_handlers

View File

@@ -1,5 +1,5 @@
# Deployed by Ansible
{% if init_system == "sysvinit" and kube_network_plugin == "flannel" and ansible_os_family == "Debian" %}
{% if ansible_service_mgr in ["sysvinit","upstart"] and kube_network_plugin == "flannel" and ansible_os_family == "Debian" %}
DOCKER_OPTS="--bip={{ flannel_subnet }} --mtu={{ flannel_mtu }}"
{% elif kube_network_plugin == "flannel" %}
OPTIONS="--bip={{ flannel_subnet }} --mtu={{ flannel_mtu }}"