Remove the -d flag to libvirtd when using systemd

If using systemd the -d flag will cause the service to always run
and the service start/stop will not properly manage the daemon.

This should make sure the behavior is not changed when using
upstart.

Change-Id: I9d9d98c92b977965b73c10ce37e4b8896723f2bf
Closes-Bug: 1647637
This commit is contained in:
Jean-Philippe Evrard 2016-12-06 10:31:38 +00:00
parent 0f11ba6665
commit 41df5aa19d

View File

@ -56,10 +56,10 @@
- nova-kvm
- nova-libvirt
- name: Set libvirt runtime options (Ubuntu)
- name: Set libvirt runtime options when listening on tcp (Ubuntu)
lineinfile:
dest: "/etc/default/libvirt-bin"
line: 'libvirtd_opts="-d -l"'
line: 'libvirtd_opts="{% if ansible_service_mgr != "systemd" %}-d{% endif%} -l"'
regexp: "^libvirtd_opts="
backup: "yes"
when:
@ -70,10 +70,10 @@
- nova-kvm
- nova-libvirt
- name: Set libvirt runtime options (Ubuntu)
- name: Set libvirt runtime options when not listening on tcp (Ubuntu)
lineinfile:
dest: "/etc/default/libvirt-bin"
line: 'libvirtd_opts="-d"'
line: 'libvirtd_opts="{% if ansible_service_mgr != "systemd" %}-d{% endif%}"'
regexp: "^libvirtd_opts="
backup: "yes"
when: