From be5b78160723adac202dc766d0c5788148606389 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 6 May 2019 12:36:43 +0200 Subject: [PATCH] nova-libvirt: in Debian qemu-kvm is x86 only This package provides just a wrapper script /usr/bin/kvm which run qemu-system-x86 in kvm mode for backwards compatibility. Change-Id: I0cc03a1ab5a79ae49fa7d13ac549e21d3ec5295d (cherry picked from commit 408554475ba02d89206a7fa01824d7277bfc2664) --- docker/nova/nova-libvirt/Dockerfile.j2 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 82aaf4b4f8..fb75e443a8 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -44,7 +44,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python3-rados', 'python3-rbd', 'qemu-block-extra', - 'qemu-kvm', 'qemu-system', 'trousers' ] %} @@ -53,6 +52,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set nova_libvirt_packages = nova_libvirt_packages + [ 'qemu-efi' ] %} + {% elif base_arch == "x86_64" %} + {% set nova_libvirt_packages = nova_libvirt_packages + [ + 'qemu-kvm' + ] %} {% endif %} {% if base_arch != "ppc64le" %}