openstack/devstack
Code Issues Proposed changes

Use qemu-kvm-ev package on centos

Browse Source 
For the latest qemu-kvm, you have to use the qemu-kvm-ev package,
which is based off the qemu-kvm-rhev package, which is explained in
[1] but you probably can't read it.  The gist is, that qemu-kvm-rhev
is a later build of kvm that is incompatible with the base version
provided.  qemu-kvm-rhev is only provided with the RHV (ovirt) and
RHOS (openstack) products.  CentOS rebuilds this package as
qemu-kvm-ev as part of it's virtualisation SIG.

I9a972e3fde2e4e552f6fc98350820c07873c3de3 has bumped up the minimum
qemu version to 2.1.0.  It seems there is a an issue (bug #1668164)
where having the qemu-system package installed gets picked up if
installed, and reports the incorrect version to nova, causing failure.

This removes the installs from files/rpms/nova as it is all being done
in function-libvirt.  We only install the qemu-kvm-ev package on
centos and remove the old work-around.

[1] https://access.redhat.com/solutions/629513
[2] https://wiki.centos.org/SpecialInterestGroup/Virtualization

Change-Id: Ide91b261f35fb19d8bd7155ca016fa3b76a45ea1
This commit is contained in:
Ian Wienand 2017-02-27 15:11:11 +11:00
parent 6f23555c95
commit 52bb64105f
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
files/rpms/nova
View File

@ -9,10 +9,6 @@ iptables
iputils iputils
kernel-modules # dist:f23,f24,f25 kernel-modules # dist:f23,f24,f25
kpartx kpartx
kvm # NOPRIME
libvirt-bin # NOPRIME
libvirt-devel # NOPRIME
libvirt-python # NOPRIME
libxml2-python libxml2-python
m2crypto m2crypto
mysql-devel mysql-devel
@ -21,7 +17,6 @@ mysql-server # NOPRIME
numpy # needed by websockify for spice console numpy # needed by websockify for spice console
parted parted
polkit polkit
qemu-kvm # NOPRIME
rabbitmq-server # NOPRIME rabbitmq-server # NOPRIME
sqlite sqlite
sudo sudo

21
lib/nova_plugins/functions-libvirt
View File

@ -34,18 +34,23 @@ 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
# On "KVM for IBM z Systems", kvm does not have its own package # On "KVM for IBM z Systems", kvm does not have its own package
if [[ ! ${DISTRO} =~ "kvmibm1" ]]; then if [[ ! ${DISTRO} =~ "kvmibm1" && ! ${DISTRO} =~ "rhel7" ]]; then
install_package kvm install_package kvm
fi fi
# there is a dependency issue with kvm (which is really just a
# wrapper to qemu-system-x86) that leaves some bios files out, if [[ ${DISTRO} =~ "rhel7" ]]; then
# so install qemu-kvm (which shouldn't strictly be needed, as # On centos7 install the qemu-kvm-ev package, which is a
# everything has been merged into qemu-system-x86) to bring in # later version of qemu-kvm rebuilt from the qemu-kvm-rhev
# the right packages. see # package by the virt SIG (as required by nova). This
# https://bugzilla.redhat.com/show_bug.cgi?id=1235890 # package is only provided for RHOS (openstack) or RHV
install_package qemu-kvm # (ovirt) in RHEL. We have already insalled the RDO
# repositories which provide this.
install_package qemu-kvm-ev
fi
install_package libvirt libvirt-devel install_package libvirt libvirt-devel
pip_install_gr libvirt-python pip_install_gr libvirt-python
fi fi
} }