openstack/kolla
Code Issues Proposed changes

Merge "nova-libvirt: in Debian qemu-kvm is x86 only"

Browse Source
This commit is contained in:
Zuul 2019-05-21 13:19:20 +00:00 committed by Gerrit Code Review
commit bbec9c7ba6
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

@ -41,7 +41,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openvswitch-switch', 'openvswitch-switch',
'pm-utils', 'pm-utils',
'qemu-block-extra', 'qemu-block-extra',
'qemu-kvm',
'qemu-system', 'qemu-system',
'trousers' 'trousers'
] %} ] %}
@ -50,6 +49,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set nova_libvirt_packages = nova_libvirt_packages + [ {% set nova_libvirt_packages = nova_libvirt_packages + [
'qemu-efi' 'qemu-efi'
] %} ] %}
{% elif base_arch == "x86_64" %}
{% set nova_libvirt_packages = nova_libvirt_packages + [
'qemu-kvm'
] %}
{% endif %} {% endif %}
{% if base_arch != "ppc64le" %} {% if base_arch != "ppc64le" %}