Do not install qemu in the Octavia devstack plugin
This patch removes the installation of qemu from the Octavia devstack plugin. It was installed to make sure the required tools were available for diskimage-builder. However, these tools should be installed via the diskimage-builder bindep.txt, which is also run from the Octavia devstack plugin. Closes-Bug: #2072590 Change-Id: I76645da7504d8e6e8120c305c73ae16adabc17c4
This commit is contained in:
parent
7974e755e1
commit
1c027c840c
@ -14,19 +14,6 @@ function octavia_install {
|
||||
else
|
||||
setup_develop $OCTAVIA_DIR
|
||||
fi
|
||||
if [ $OCTAVIA_NODE == 'main' ] || [ $OCTAVIA_NODE == 'standalone' ] ; then
|
||||
if ! [ "$DISABLE_AMP_IMAGE_BUILD" == 'True' ]; then
|
||||
if [[ ${DISTRO} =~ (rhel|centos) ]]; then
|
||||
install_package qemu-kvm
|
||||
if [[ "$OCTAVIA_AMP_BASE_OS" == "rocky" ]]; then
|
||||
# DIB requires podman for building rockylinux images.
|
||||
install_package podman
|
||||
fi
|
||||
else
|
||||
install_package qemu
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
function octaviaclient_install {
|
||||
|
Loading…
x
Reference in New Issue
Block a user