diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-08 18:58:30 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-08 19:40:00 +0200 |
| commit | 6ea6921ad4ad2bea138151da0fea02b30d0c839a (patch) | |
| tree | eee95dc24518fade87a5ea9f3a94b5861e8e6e1b /patches/opnfv-fuel/0017-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch | |
| parent | 9562785a3c51db675238e3fdd4ff04d50f862ba8 (diff) | |
u/fuel: Bump & rebase for mcp.rsa relocation
mcp.rsa will now be available in /var/lib/opnfv/mcp.rsa.
JIRA: FUEL-280
Change-Id: I933c669ddde495f0decba2fcc7fc8d9818a24620
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0017-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch')
| -rw-r--r-- | patches/opnfv-fuel/0017-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch | 6 |
1 files changed, 3 insertions, 3 deletions
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 index 84905a4b..8ce12c32 100644 --- 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 @@ -31,7 +31,7 @@ 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 1812663..884e852 100644 +index 94a9bd3..f1781e8 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -28,6 +28,15 @@ get_base_image() { @@ -50,11 +50,11 @@ index 1812663..884e852 100644 cleanup_vms() { # clean up existing nodes for node in $(virsh list --name | grep -P '\w{3}\d{2}'); do -@@ -43,6 +52,7 @@ prepare_vms() { +@@ -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}" - envsubst '${SALT_MASTER},${CLUSTER_DOMAIN}' < \ + # shellcheck disable=SC2016 |