aboutsummaryrefslogtreecommitdiff
path: root/docker/nova
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2019-05-06 12:36:43 +0200
committerMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2019-05-06 12:36:59 +0200
commit408554475ba02d89206a7fa01824d7277bfc2664 (patch)
tree2c8860d551dea57367e69c1b19bce89d59a87049 /docker/nova
parent9e9e31ed2c671d7547354708bb8decc05c737ecd (diff)
downloadkolla-408554475ba02d89206a7fa01824d7277bfc2664.tar.gz
kolla-408554475ba02d89206a7fa01824d7277bfc2664.zip
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
Diffstat (limited to 'docker/nova')
-rw-r--r--docker/nova/nova-libvirt/Dockerfile.j25
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2
index b21f45c85..9c54d84d9 100644
--- a/docker/nova/nova-libvirt/Dockerfile.j2
+++ b/docker/nova/nova-libvirt/Dockerfile.j2
@@ -41,7 +41,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openvswitch-switch',
'pm-utils',
'qemu-block-extra',
- 'qemu-kvm',
'qemu-system',
'trousers'
] %}
@@ -50,6 +49,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" %}