commit c19d0cbb27d2cd387d9b4543fc59ac6c084a68e6
author Zuul <zuul@review.openstack.org> Tue Nov 21 20:04:34 2017 +0000
committer Gerrit Code Review <review@openstack.org> Tue Nov 21 20:04:34 2017 +0000
tree 29dfd93b38dc08a64a92e5263b061a2ebbc74c64
parent ec31a52560c5ee0b457b186f1bb73a18e53df6f8
parent 2c2ca80ce0caadc9efa18c9f9289f6b98b3c486e

Merge "Fix libvirt daemon name condition"

lib/nova_plugins/functions-libvirt

diff --git a/lib/nova_plugins/functions-libvirt b/lib/nova_plugins/functions-libvirt
index dbfa3b5..147ed8b 100644
--- a/lib/nova_plugins/functions-libvirt
+++ b/lib/nova_plugins/functions-libvirt
@@ -25,7 +25,7 @@
 DEBUG_LIBVIRT_COREDUMPS=$(trueorfalse False DEBUG_LIBVIRT_COREDUMPS)
 
 # Only Xenial is left with libvirt-bin.  Everywhere else is libvirtd
-if is_ubuntu && [ ! -f /etc/init.d/libvirtd ]; then
+if is_ubuntu && [ ${DISTRO} == "xenial" ]; then
     LIBVIRT_DAEMON=libvirt-bin
 else
     LIBVIRT_DAEMON=libvirtd