u/fuel: Bump & rebase for cinder support

Change-Id: Ie116967d0dd909f1901e2099485795316a706ad7
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

1 files changed, 0 insertions, 60 deletions

diff --git a/patches/opnfv-fuel/0018-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch b/patches/opnfv-fuel/0018-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch
deleted file mode 100644
index 7f9c4a23..00000000
--- a/patches/opnfv-fuel/0018-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 <Alexandru.Avadanii@enea.com>
-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 <Alexandru.Avadanii@enea.com>
----
- mcp/scripts/lib.sh | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
-index 3f74058..5389ced 100644
---- a/mcp/scripts/lib.sh
-+++ b/mcp/scripts/lib.sh
-@@ -25,6 +25,15 @@ get_base_image() {
-   wget -P /tmp -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
-@@ -39,6 +48,7 @@ prepare_vms() {
-   local -n vnodes=$1
-   local base_image=$2
-
-+  cleanup_uefi
-   cleanup_vms
-   get_base_image "${base_image}"
-   envsubst < user-data.template > user-data.sh