Eric Fried c6b5ebf35f devstack: Fix libvirtd/libvirt-bin detection
Attempting to devstack on bionic failed with:

Failed to restart libvirt-bin.service: Unit libvirt-bin.service not found.

devstack/lib/ironic was trying to figure out whether our libvirtd
service is called libvirtd or libvirt-bin based on:
- Are we on ubuntu?
- Does /etc/init.d/libvirtd not exist?

 if is_ubuntu && [ ! -f /etc/init.d/libvirtd ]; then
     libvirt_service_name="libvirt-bin"

But on this bionic, for whatever reason, my libvirtd is at
/usr/sbin/libvirtd.

However, `type libvirtd` succeeds in either case.

So this commit broadens the second part of that check accordingly.

Note, FWIW, that devstack's lib/nova_plugins/functions-libvirt checks
this way:

 # Only Xenial is left with libvirt-bin.  Everywhere else is libvirtd
 if is_ubuntu && [ ${DISTRO} == "xenial" ]; then
     LIBVIRT_DAEMON=libvirt-bin
 else
     LIBVIRT_DAEMON=libvirtd
 fi

Change-Id: I94a86a96d5732db60c12399fcaf666f960461e3e
2019-08-16 15:11:04 -05:00
..