openstack
/
kolla
Code Issues Proposed changes

Merge "nova-libvirt: in Debian qemu-kvm is x86 only" into stable/stein

This commit is contained in:
Zuul 2019-07-23 21:06:29 +00:00 committed by Gerrit Code Review
parent eb20d04ed1 be5b781607
commit 9ef040a85d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/nova/nova-libvirt/Dockerfile.j2
View File

@ -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" %}