From f902ca22801221c516b2dc70395e94c651f7c61d Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 4 Feb 2017 15:43:52 +0100 Subject: deploy: EFI: Obsolete patch: Skip IPMI re-ordering Now that ARMBAND-50 is comleted, revert the temporary workaround we applied as part of ARMBAND-71. JIRA: ARMBAND-138 Change-Id: I1beac1fb3ba5b264f70bd4737f3c3e2c1bea46f0 Signed-off-by: Alexandru Avadanii --- ...deploy-EFI-Skip-re-ordering-boot-via-IPMI.patch | 31 ---------------------- 1 file changed, 31 deletions(-) delete mode 100644 patches/opnfv-fuel/multiarch-efi/0001-FIXME-deploy-EFI-Skip-re-ordering-boot-via-IPMI.patch diff --git a/patches/opnfv-fuel/multiarch-efi/0001-FIXME-deploy-EFI-Skip-re-ordering-boot-via-IPMI.patch b/patches/opnfv-fuel/multiarch-efi/0001-FIXME-deploy-EFI-Skip-re-ordering-boot-via-IPMI.patch deleted file mode 100644 index 3b3c612a..00000000 --- a/patches/opnfv-fuel/multiarch-efi/0001-FIXME-deploy-EFI-Skip-re-ordering-boot-via-IPMI.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Alexandru Avadanii -Date: Fri, 9 Sep 2016 17:55:38 +0200 -Subject: [PATCH] FIXME: deploy: EFI: Skip re-ordering boot via IPMI - -On EFI systems deploys, altering the boot order via IPMI causes -issues on some specific targets. Until we agree on an uniform -solution for EFI systems + IPMI boot order handling, just skip -altering it via IPMI. - -Related-bug: https://jira.opnfv.org/browse/ARMBAND-71 - -Signed-off-by: Alexandru Avadanii ---- - deploy/deploy_env.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/deploy/deploy_env.py b/deploy/deploy_env.py -index 93dc395..1d2dfeb 100644 ---- a/deploy/deploy_env.py -+++ b/deploy/deploy_env.py -@@ -255,7 +255,9 @@ class CloudDeploy(object): - - def set_boot_order_nodes(self): - self.power_off_nodes() -- self.set_boot_order(['pxe', 'disk']) -+ # ARMBAND FIXME: See https://jira.opnfv.org/browse/ARMBAND-71 -+ # Until we choose an uniform design on EFI systems, just disable it -+ # self.set_boot_order(['pxe', 'disk']) - self.power_on_nodes() - - def get_put_deploy_log(self): -- cgit 1.2.3-korg