diff options
| author | Zuul <zuul@review.opendev.org> | 2020-10-01 10:46:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-10-01 10:46:41 +0000 |
| commit | 2e094adbbb128c06fdd32fea4c06ef86db1490d6 (patch) | |
| tree | ffa409721ff2106aed4aa7856bce82bc6a67b37e /docker | |
| parent | d033d91f94a81b3566b489c46860af25fed8312c (diff) | |
| parent | 84038e337a8ced755c13ac387fdbf38f383c06ce (diff) | |
| download | kolla-2e094adbbb128c06fdd32fea4c06ef86db1490d6.tar.gz kolla-2e094adbbb128c06fdd32fea4c06ef86db1490d6.zip | |
Merge "Debian: use QEMU 5.0 from buster-backports"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/apt_preferences.debian | 5 | ||||
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index 181ce5718..01be5229d 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -41,3 +41,8 @@ Pin-Priority: 700 Package: openvswitch* Pin: release n=buster Pin-Priority: 700 + +# we want newer QEMU +Package: qemu* +Pin: version 1:5.0* +Pin-Priority: 700 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'] %} |