diff options
| author | Zuul <zuul@review.opendev.org> | 2019-05-21 13:19:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-05-21 13:19:20 +0000 |
| commit | bbec9c7ba6457e4e8df6f535c1915f941336caf3 (patch) | |
| tree | ee4e9f9c21dd5a143f1ceca3a3b1164d547f8b85 /docker | |
| parent | dbdf927d391904252464ab401cb5724e10a45a72 (diff) | |
| parent | 408554475ba02d89206a7fa01824d7277bfc2664 (diff) | |
| download | kolla-bbec9c7ba6457e4e8df6f535c1915f941336caf3.tar.gz kolla-bbec9c7ba6457e4e8df6f535c1915f941336caf3.zip | |
Merge "nova-libvirt: in Debian qemu-kvm is x86 only"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 5 |
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" %} |