From fece20c8a9afacb8506158003bc29fff40e13adc Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <dtantsur@protonmail.com>
Date: Mon, 26 Oct 2020 14:35:17 +0100
Subject: [PATCH] devstack: remove no longer required UEFI hacks
* libvirt is usually shipped with the correct nvram options
* Fedora already has the suitable iPXE ROM
Change-Id: Ia53e25cee646241c8dccc6296c62f90c6793abc7
---
devstack/lib/ironic | 19 -------------------
1 file changed, 19 deletions(-)
diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index b0280f3fbb..6737586faf 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -1104,25 +1104,6 @@ function install_ironic {
install_apache_wsgi
fi
- if [[ "$IRONIC_BOOT_MODE" == "uefi" && "$IRONIC_IS_HARDWARE" == "False" ]]; then
-
- # Append the nvram configuration to libvirt if it's not present already
- if ! sudo grep -q "^nvram" /etc/libvirt/qemu.conf; then
- echo "nvram=[\"$UEFI_LOADER_PATH:$UEFI_NVRAM_PATH\"]" | sudo tee -a /etc/libvirt/qemu.conf
- fi
-
- # Replace the default virtio PXE ROM in QEMU with an EFI capable
- # one. The EFI ROM should work on with both boot modes, Legacy
- # BIOS and UEFI.
- if is_fedora; then
- sudo rm /usr/share/qemu/pxe-virtio.rom
- sudo ln -s /usr/share/ipxe.efi/1af41000.rom /usr/share/qemu/pxe-virtio.rom
- fi
-
- # Restart libvirt to the changes to take effect
- restart_libvirt
- fi
-
if is_redfish_enabled || is_deployed_by_redfish; then
setup_sushy
fi