From 2da79800d8ee9bc4210740255a42f7ec7a65c072 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 28 Aug 2017 19:45:08 +0200 Subject: p/fuel: Rebase for os cacert While rebasing, drop batch apply of linux.network state for VCP nodes, as it does not fix the underlying problem and only introduces extra delay. Reverts commits: 4f1bfdd Change-Id: I365b029aa2855334e295907cdde623b1717fc69a Signed-off-by: Alexandru Avadanii --- ...-maas-rm-Ubuntu-boot-entry-on-EFI-systems.patch | 41 ---------------------- 1 file changed, 41 deletions(-) delete mode 100644 patches/opnfv-fuel/0019-states-maas-rm-Ubuntu-boot-entry-on-EFI-systems.patch (limited to 'patches/opnfv-fuel/0019-states-maas-rm-Ubuntu-boot-entry-on-EFI-systems.patch') diff --git a/patches/opnfv-fuel/0019-states-maas-rm-Ubuntu-boot-entry-on-EFI-systems.patch b/patches/opnfv-fuel/0019-states-maas-rm-Ubuntu-boot-entry-on-EFI-systems.patch deleted file mode 100644 index cc9be244..00000000 --- a/patches/opnfv-fuel/0019-states-maas-rm-Ubuntu-boot-entry-on-EFI-systems.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Alexandru Avadanii -Date: Thu, 24 Aug 2017 04:09:59 +0200 -Subject: [PATCH] states/maas: 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. - -NOTE: This only runs against nodes that are online from a -previous deploy, and already automatically registered with -the new Salt master node. - -Closes: ARMBAND-47 - -Signed-off-by: Alexandru Avadanii ---- - mcp/config/states/maas | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index 697f83c..383063d 100755 ---- a/mcp/config/states/maas -+++ b/mcp/config/states/maas -@@ -44,6 +44,11 @@ function maas_fixup() { - return 0 - } - -+# UEFI: Clean up Ubuntu boot entry if kvm node online from previous deploy -+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" -+ - # MaaS rack/region controller, node commissioning - salt -C 'mas01*' cmd.run "add-apt-repository ppa:maas/stable" - -- cgit 1.2.3-korg