diff --git a/files/rpms/nova b/files/rpms/nova index 45f1c94f1f..a368c552aa 100644 --- a/files/rpms/nova +++ b/files/rpms/nova @@ -9,10 +9,6 @@ iptables iputils kernel-modules # dist:f23,f24,f25 kpartx -kvm # NOPRIME -libvirt-bin # NOPRIME -libvirt-devel # NOPRIME -libvirt-python # NOPRIME libxml2-python m2crypto mysql-devel @@ -21,7 +17,6 @@ mysql-server # NOPRIME numpy # needed by websockify for spice console parted polkit -qemu-kvm # NOPRIME rabbitmq-server # NOPRIME sqlite sudo diff --git a/lib/nova_plugins/functions-libvirt b/lib/nova_plugins/functions-libvirt index 47b054bc58..d225ef84fb 100644 --- a/lib/nova_plugins/functions-libvirt +++ b/lib/nova_plugins/functions-libvirt @@ -34,18 +34,23 @@ function install_libvirt { #pip_install_gr elif is_fedora || is_suse; then # 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 fi - # there is a dependency issue with kvm (which is really just a - # wrapper to qemu-system-x86) that leaves some bios files out, - # so install qemu-kvm (which shouldn't strictly be needed, as - # everything has been merged into qemu-system-x86) to bring in - # the right packages. see - # https://bugzilla.redhat.com/show_bug.cgi?id=1235890 - install_package qemu-kvm + + if [[ ${DISTRO} =~ "rhel7" ]]; then + # On centos7 install the qemu-kvm-ev package, which is a + # later version of qemu-kvm rebuilt from the qemu-kvm-rhev + # package by the virt SIG (as required by nova). This + # package is only provided for RHOS (openstack) or RHV + # (ovirt) in RHEL. We have already insalled the RDO + # repositories which provide this. + install_package qemu-kvm-ev + fi + install_package libvirt libvirt-devel pip_install_gr libvirt-python + fi }