From a917eb7166fcec88c64c4e6d6f8018c967a9940e Mon Sep 17 00:00:00 2001 From: Attila Fazekas Date: Fri, 3 Aug 2018 17:08:45 +0200 Subject: Using qemu-kvm on rhel qemu-kvm-ev was used with centos, in case of rhel when you have access to the virtualisation related channels qemu-kvm pulls qemu-kvm-rhev which is the recommended one. qemu-kvm-ev was referenced by devstack long time ago, but the explicit package install on rhel family today is qemu-kvm and not qemu-kvm-ev. I am unsure about the other distros, so just changing rhel. Change-Id: If6d1e0367730fa80284395be33674a7cd1465389 --- docker/nova/nova-libvirt/Dockerfile.j2 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'docker/nova') diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index f5de27817..f62fe90dc 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -19,8 +19,16 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'libvirt-daemon-driver-lxc', 'libvirt-daemon-driver-nwfilter', 'openvswitch', - 'qemu-kvm-ev' ] %} + {% if base_distro in ['centos', 'oraclelinux'] %} + {% set nova_libvirt_packages = nova_libvirt_packages + [ + 'qemu-kvm-ev' + ] %} + {% else %} + {% set nova_libvirt_packages = nova_libvirt_packages + [ + 'qemu-kvm' + ] %} + {% endif %} {% elif base_distro in ['debian', 'ubuntu'] %} -- cgit v1.2.3