diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-08-22 17:57:32 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-08-24 09:57:54 +0200 |
| commit | 84038e337a8ced755c13ac387fdbf38f383c06ce (patch) | |
| tree | 6c9f87208be06a69c454d64f68049e7760642d4f /docker/nova | |
| parent | f64ecd98e8df26589b85b5b7445d5e0eca8ee15a (diff) | |
| download | kolla-84038e337a8ced755c13ac387fdbf38f383c06ce.tar.gz kolla-84038e337a8ced755c13ac387fdbf38f383c06ce.zip | |
Debian: use QEMU 5.0 from buster-backports
This will allow us to make sure of all updates.
'qemu-kvm' got dropped in Debian
Change-Id: If09a8188030baa284dd353b1c3f830d78c5091b7
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index e078df301..794d903eb 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -71,8 +71,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif base_arch == "x86_64" %} {% set nova_libvirt_packages = nova_libvirt_packages + [ 'ovmf', - 'qemu-kvm' ] %} + # NOTE(hrw): Debian merged 'qemu-kvm' into 'qemu-system-ARCH' in 5.0-9 + {% if base_distro == 'ubuntu' %} + {% set nova_libvirt_packages = nova_libvirt_packages + [ + 'qemu-kvm' + ] %} + {% endif %} {% endif %} {% if base_arch in ['aarch64', 'x86_64'] %} |