Fix install_libvirt for other RHEL-based distros

Evgeny Antyshev · ianw · commit 53bc172448d1 · 2017-03-16T10:40:08.000+11:00
Since https://review.openstack.org/#/c/438325 landed it only works for Centos 7, but not for other RHEL-based distributions: Virtuozzo and, probably, RHEV. Both of above have own version for qemu-kvm package: qemu-kvm-vz and qemu-kvm-rhev, accordingly. These packages provide "qemu-kvm", like qemu-kvm-ev, and, when you call "yum install qemu-kvm", they replace the default OS package. Change-Id: I46da627c0da8925064862fdc283db81591979285 (cherry picked from 008aa3e)
diff --git a/lib/nova_plugins/functions-libvirt b/lib/nova_plugins/functions-libvirt
@@ -39,13 +39,11 @@ function install_libvirt {
         fi
 
         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
+            # This should install the latest qemu-kvm build,
+            # which is called qemu-kvm-ev in centos7
+            # (as the default OS qemu-kvm package is usually rather old,
+            # and should be updated by above)
+            install_package qemu-kvm
         fi
 
         install_package libvirt libvirt-devel
