openstack/devstack
Code Issues Proposed changes

Merge "Only install python-libguestfs bindings when needed"

Browse Source
This commit is contained in:
Jenkins 2015-06-23 22:43:01 +00:00 committed by Gerrit Code Review
commit c4067a3cc0
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/nova_plugins/functions-libvirt
View File

@ -28,7 +28,6 @@ function install_libvirt {
else else
install_package qemu-kvm install_package qemu-kvm
install_package libguestfs0 install_package libguestfs0
install_package python-guestfs
fi fi
install_package libvirt-bin libvirt-dev install_package libvirt-bin libvirt-dev
pip_install_gr libvirt-python pip_install_gr libvirt-python
@ -37,7 +36,6 @@ function install_libvirt {
install_package kvm install_package kvm
install_package libvirt libvirt-devel install_package libvirt libvirt-devel
pip_install_gr libvirt-python pip_install_gr libvirt-python
install_package python-libguestfs
fi fi
} }

11
lib/nova_plugins/hypervisor-libvirt
View File

@ -26,7 +26,7 @@ source $TOP_DIR/lib/nova_plugins/functions-libvirt
# -------- # --------
# File injection is disabled by default in Nova. This will turn it back on. # File injection is disabled by default in Nova. This will turn it back on.
ENABLE_FILE_INJECTION=${ENABLE_FILE_INJECTION:-False} ENABLE_FILE_INJECTION=$(trueorfalse False ENABLE_FILE_INJECTION)
# Entry Points # Entry Points
@ -60,7 +60,6 @@ function configure_nova_hypervisor {
iniset $NOVA_CONF DEFAULT vnc_enabled "false" iniset $NOVA_CONF DEFAULT vnc_enabled "false"
fi fi
ENABLE_FILE_INJECTION=$(trueorfalse False ENABLE_FILE_INJECTION)
if [[ "$ENABLE_FILE_INJECTION" = "True" ]] ; then if [[ "$ENABLE_FILE_INJECTION" = "True" ]] ; then
# When libguestfs is available for file injection, enable using # When libguestfs is available for file injection, enable using
# libguestfs to inspect the image and figure out the proper # libguestfs to inspect the image and figure out the proper
@ -97,6 +96,14 @@ function install_nova_hypervisor {
yum_install libcgroup-tools yum_install libcgroup-tools
fi fi
fi fi
if [[ "$ENABLE_FILE_INJECTION" = "True" ]] ; then
if is_ubuntu; then
install_package python-guestfs
elif is_fedora || is_suse; then
install_package python-libguestfs
fi
fi
} }
# start_nova_hypervisor - Start any required external services # start_nova_hypervisor - Start any required external services