From 9519a11e1fe0eb26cf5b776d8479065f2f710737 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 11 Sep 2017 20:17:20 +0200 Subject: u/fuel: Bump & rebase for multiarch reclass Change-Id: I3de41645b7424195b9c8d5884a7c9de1fabf68cb Signed-off-by: Alexandru Avadanii --- ...ib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch | 60 ---------------------- 1 file changed, 60 deletions(-) delete mode 100644 patches/opnfv-fuel/0017-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch (limited to 'patches/opnfv-fuel/0017-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch') diff --git a/patches/opnfv-fuel/0017-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch b/patches/opnfv-fuel/0017-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch deleted file mode 100644 index 8ce12c32..00000000 --- a/patches/opnfv-fuel/0017-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch +++ /dev/null @@ -1,60 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 Enea AB and others. -: -: All rights reserved. This program and the accompanying materials -: are made available under the terms of the Apache License, Version 2.0 -: which accompanies this distribution, and is available at -: http://www.apache.org/licenses/LICENSE-2.0 -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -From: Alexandru Avadanii -Date: Thu, 24 Aug 2017 04:09:59 +0200 -Subject: [PATCH] lib.sh: rm Ubuntu boot entry on EFI systems - -On EFI-enabled systems, grub-install from grub-efi-* package -installs a boot entry named "ubuntu". - -MaaS relies on IPMI to set boot order to PXE first; however -on systems with buggy firmware or without full IPMI support, -that fails, leading to booting Ubuntu from hard disk instead. - -Work around this by clearing any previous Ubuntu boot entry -from board flash, before starting a new baremetal deploy. - -NOTE: This only runs against nodes that are online from a -previous deploy. - -Closes: ARMBAND-47 - -Signed-off-by: Alexandru Avadanii ---- - mcp/scripts/lib.sh | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh -index 94a9bd3..f1781e8 100644 ---- a/mcp/scripts/lib.sh -+++ b/mcp/scripts/lib.sh -@@ -28,6 +28,15 @@ get_base_image() { - wget -P "${image_dir}" -N "${base_image}" - } - -+cleanup_uefi() { -+ # Clean up Ubuntu boot entry if cfg01, kvm nodes online from previous deploy -+ # shellcheck disable=SC2086 -+ ssh ${SSH_OPTS} "ubuntu@${SALT_MASTER}" "sudo salt -C 'kvm* or cmp*' cmd.run \ -+ \"which efibootmgr > /dev/null 2>&1 && \ -+ efibootmgr | grep -oP '(?<=Boot)[0-9]+(?=.*ubuntu)' | \ -+ xargs -I{} efibootmgr --delete-bootnum --bootnum {}\"" || true -+} -+ - cleanup_vms() { - # clean up existing nodes - for node in $(virsh list --name | grep -P '\w{3}\d{2}'); do -@@ -45,6 +54,7 @@ prepare_vms() { - local base_image=$2 - local image_dir=$3 - -+ cleanup_uefi - cleanup_vms - get_base_image "${base_image}" "${image_dir}" - # shellcheck disable=SC2016 -- cgit 1.2.3-korg