From e726ecb537ee09187169902f19840ab432eeb5ae Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Thu, 14 May 2020 11:35:03 +0200 Subject: [PATCH] Remove sgabios.bin workaround The bug has been fixed since a while, also in recent distributions, for example Ubuntu 20.04, the sgabios.bin ROM is provided directly by qemu-system-data as an actual file under /usr/share/qemu and it conflicts with the one provided by sgabios, so removing the workaround is actually needed to prevent failures. Change-Id: Ib5f23dbd8839a0927418692054f4ed4abd76babc --- lib/nova_plugins/hypervisor-ironic | 7 ------- 1 file changed, 7 deletions(-) diff --git a/lib/nova_plugins/hypervisor-ironic b/lib/nova_plugins/hypervisor-ironic index 113e2a75ea..b147c4327a 100644 --- a/lib/nova_plugins/hypervisor-ironic +++ b/lib/nova_plugins/hypervisor-ironic @@ -68,13 +68,6 @@ function install_nova_hypervisor { return fi install_libvirt - if [[ "$IRONIC_VM_LOG_CONSOLE" == "True" ]] && is_ubuntu; then - # Ubuntu packaging+apparmor issue prevents libvirt from loading - # the ROM from /usr/share/misc. Workaround by installing it directly - # to a directory that it can read from. (LP: #1393548) - sudo rm -rf /usr/share/qemu/sgabios.bin - sudo cp /usr/share/misc/sgabios.bin /usr/share/qemu/sgabios.bin - fi } # start_nova_hypervisor - Start any required external services