openstack
/
octavia
Code Issues Proposed changes

Merge "devstack: install qemu-kvm on RHEL-based distros"

This commit is contained in:
Jenkins 2017-03-16 01:15:27 +00:00 committed by Gerrit Code Review
parent 4b9c841c0c 8aa15008bb
commit fc675669d6
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devstack/plugin.sh
View File

@ -9,7 +9,15 @@ function octavia_install {
setup_develop $OCTAVIA_DIR
if [ $OCTAVIA_NODE == 'main' ] || [ $OCTAVIA_NODE == 'standalone' ] ; then
if ! [ "$DISABLE_AMP_IMAGE_BUILD" == 'True' ]; then
install_package qemu kpartx
install_package kpartx
if [[ ${DISTRO} =~ "rhel7" ]]; then
# Installing qemu would bring in the default OS qemu package,
# which is too old for Pike and later releases
# See https://review.openstack.org/#/c/438325 for details
install_package qemu-kvm
else
install_package qemu
fi
fi
fi
}