Merge "libvirt: Support the use of the virt-preview repo when using Fedora"

This commit is contained in:
Zuul 2020-01-29 04:51:39 +00:00 committed by Gerrit Code Review
commit d5c964d95e

View File

@ -24,6 +24,10 @@ DEBUG_LIBVIRT=$(trueorfalse True DEBUG_LIBVIRT)
# Currently fairly specific to OpenStackCI hosts # Currently fairly specific to OpenStackCI hosts
DEBUG_LIBVIRT_COREDUMPS=$(trueorfalse False DEBUG_LIBVIRT_COREDUMPS) DEBUG_LIBVIRT_COREDUMPS=$(trueorfalse False DEBUG_LIBVIRT_COREDUMPS)
# Enable the Fedora Virtualization Preview Copr repo that provides the latest
# rawhide builds of QEMU, Libvirt and other virt tools.
ENABLE_FEDORA_VIRT_PREVIEW_REPO=$(trueorfalse False ENABLE_FEDORA_VIRT_PREVIEW_REPO)
# Enable coredumps for libvirt # Enable coredumps for libvirt
# Bug: https://bugs.launchpad.net/nova/+bug/1643911 # Bug: https://bugs.launchpad.net/nova/+bug/1643911
function _enable_coredump { function _enable_coredump {
@ -61,6 +65,12 @@ function install_libvirt {
#pip_install_gr <there-si-no-guestfs-in-pypi> #pip_install_gr <there-si-no-guestfs-in-pypi>
elif is_fedora || is_suse; then elif is_fedora || is_suse; then
# Optionally enable the virt-preview repo when on Fedora
if [[ $DISTRO =~ f[0-9][0-9] ]] && [[ ${ENABLE_FEDORA_VIRT_PREVIEW_REPO} == "True" ]]; then
# https://copr.fedorainfracloud.org/coprs/g/virtmaint-sig/virt-preview/
sudo dnf copr enable -y @virtmaint-sig/virt-preview
fi
# Note that in CentOS/RHEL this needs to come from the RDO # Note that in CentOS/RHEL this needs to come from the RDO
# repositories (qemu-kvm-ev ... which provides this package) # repositories (qemu-kvm-ev ... which provides this package)
# as the base system version is too old. We should have # as the base system version is too old. We should have