openstack/devstack
Code Issues Proposed changes

Merge "Fix libguestfs on Ubuntu"

Browse Source
This commit is contained in:
Jenkins 2016-12-05 17:34:29 +00:00 committed by Gerrit Code Review
commit d0df7c88f2
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/nova_plugins/hypervisor-libvirt
View File

@ -105,6 +105,16 @@ function install_nova_hypervisor {
if [[ "$ENABLE_FILE_INJECTION" == "True" ]] ; then if [[ "$ENABLE_FILE_INJECTION" == "True" ]] ; then
if is_ubuntu; then if is_ubuntu; then
install_package python-guestfs install_package python-guestfs
# NOTE(andreaf) Ubuntu kernel can only be read by root, which breaks libguestfs:
# https://bugs.launchpad.net/ubuntu/+source/linux/+bug/759725)
INSTALLED_KERNELS="$(ls /boot/vmlinuz-*)"
for kernel in $INSTALLED_KERNELS; do
STAT_OVERRIDE="root root 644 ${kernel}"
# unstack won't remove the statoverride, so make this idempotent
if [[ ! $(dpkg-statoverride --list | grep "$STAT_OVERRIDE") ]]; then
sudo dpkg-statoverride --add --update $STAT_OVERRIDE
fi
done
elif is_fedora || is_suse; then elif is_fedora || is_suse; then
install_package python-libguestfs install_package python-libguestfs
fi fi