From 8ec8ef3d8a1a852187bbaf4b592f0739e2796abd Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Fri, 18 Jun 2021 07:22:35 +0200 Subject: Revert "libvirt: pin edk2-ovmf" The "internal error: unknown feature amd-sev-es" error in libvirt seen with the edk2-ovmf package is fixed by a commit in libvirt 7.4.0 [0] to avoid erroring out on unknown QEMU firmware features. CentOS Stream 8 was wrongly using the CentOS 8 advanced-virtualization repository [1] instead of the CentOS Stream 8 one [2]. This is fixed by centos-release-advanced-virtualization-1.0-3 [3], which should bring libvirt-7.4.0-1 into our nova-libvirt image. This reverts commit 1a2c33512b6c4bdcdbf7d7bb08e791fb53e4f063. [0] https://github.com/libvirt/libvirt/commit/61d95a1073833ec4323c1ef28e71e913c55aa7b9 [1] http://mirror.centos.org/centos/8/virt/x86_64/advanced-virtualization/ [2] http://mirror.centos.org/centos/8-stream/virt/x86_64/advancedvirt-common/ [3] https://koji.mbox.centos.org/koji/buildinfo?buildID=18004 Change-Id: I1f58262109dd27a4c4ee9b60d87010170b5ea7bb --- docker/nova/nova-libvirt/Dockerfile.j2 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'docker/nova') diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index aa2395d02..140c56c24 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -26,9 +26,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'trousers' ] %} {% if base_arch == 'x86_64' %} - # TODO(mnasiadka): Remove pin after https://bugzilla.redhat.com/show_bug.cgi?id=1961558#c10 is fixed {% set nova_libvirt_packages = nova_libvirt_packages + [ - 'edk2-ovmf-20200602gitca407c7246bf-4.el8' + 'edk2-ovmf' ] %} {% elif base_arch == 'aarch64' %} {% set nova_libvirt_packages = nova_libvirt_packages + [ -- cgit v1.2.3