diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-13 23:28:38 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-15 01:10:12 +0000 |
| commit | 6e71b19097781a7190bcec015afc62be7961fa43 (patch) | |
| tree | 4c0dce6536ffa7090f10af75aabcea0de16efffc /patches/opnfv-fuel/0012-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch | |
| parent | 956d1d0056c54fe4c886126dcf489b547b01d49a (diff) | |
u/fuel: Bump & rebase for VCP state split
Change-Id: I6f0367d75ea831de78ced480ea73d1cd10680b80
(cherry picked from commit 11143873e70e65d07d73617b8af29a07adffc1aa)
Diffstat (limited to 'patches/opnfv-fuel/0012-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch')
| -rw-r--r-- | patches/opnfv-fuel/0012-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/patches/opnfv-fuel/0012-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch b/patches/opnfv-fuel/0012-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch index e0388403..6164d23d 100644 --- a/patches/opnfv-fuel/0012-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch +++ b/patches/opnfv-fuel/0012-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch @@ -31,14 +31,14 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 1 file changed, 10 insertions(+) diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh -index fcc5d76..c0eb330 100644 +index 3a6deec..c355141 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh -@@ -28,6 +28,15 @@ get_base_image() { +@@ -28,6 +28,15 @@ function get_base_image { wget -P "${image_dir}" -N "${base_image}" } -+cleanup_uefi() { ++function 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 \ @@ -47,10 +47,10 @@ index fcc5d76..c0eb330 100644 + xargs -I{} efibootmgr --delete-bootnum --bootnum {}\"" || true +} + - cleanup_vms() { + function 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() { +@@ -45,6 +54,7 @@ function prepare_vms { local base_image=$2 local image_dir=$3 |