openstack/devstack
Code Issues Proposed changes

Remove Fedora/libvirt workaround

Browse Source 
An updated libvirt package to address [1] is in Fedora 20 now, so we
don't need this work-around.  Modify the comments of the other part of
the work-around (restart of services) and link to the most relevant
bug

[1] https://bugzilla.redhat.com/show_bug.cgi?id=1098376

Change-Id: I47fba7b4f273162c2af1e37902a512041449750b
This commit is contained in:
Ian Wienand 2014-05-27 13:58:12 +10:00
parent 1e6e4289bc
commit e6d99a946f
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/nova_plugins/functions-libvirt
View File

@ -29,19 +29,10 @@ function install_libvirt {
install_package python-libguestfs install_package python-libguestfs
fi fi
# workaround for # Restart dbus/firewalld after install of libvirt to avoid a
# https://bugzilla.redhat.com/show_bug.cgi?id=1098376; if we see # problem with polkit, which libvirtd brings in. See
# the empty Xen proc file then remove the xen/libxl plugin # https://bugzilla.redhat.com/show_bug.cgi?id=1099031
# shared-libraries (yum remove would uninstall libvirt due to if is_fedora; then
# dependencies, so let's avoid that...)
if is_fedora && [ -f /proc/xen/capabilities ] && \
[ $(stat -c '%s' /proc/xen/capabilities) -eq 0 ]; then
sudo rm -f /usr/lib64/libvirt/connection-driver/libvirt_driver_libxl.so
sudo rm -f /usr/lib64/libvirt/connection-driver/libvirt_driver_xen.so
# another bug requires these to be restarted to avoid
# potential hang of libvirtd
# https://bugzilla.redhat.com/show_bug.cgi?id=1098866
sudo service dbus restart sudo service dbus restart
sudo service firewalld restart sudo service firewalld restart
fi fi