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>

diff --git a/patches/opnfv-fuel/0009-network-public-mgmt-Use-arm-pod3-POD-config.patch b/patches/opnfv-fuel/0009-network-public-mgmt-Use-arm-pod3-POD-config.patch
index ca13186..3ae543a 100644 (file)
--- a/patches/opnfv-fuel/0009-network-public-mgmt-Use-arm-pod3-POD-config.patch
+++ b/patches/opnfv-fuel/0009-network-public-mgmt-Use-arm-pod3-POD-config.patch
@@ -24,12 +24,12 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  7 files changed, 86 insertions(+), 86 deletions(-)
 
 diff --git a/ci/deploy.sh b/ci/deploy.sh
-index f73fdfc..21b8bab 100755
+index 4b64000..059ace5 100755
 --- a/ci/deploy.sh
 +++ b/ci/deploy.sh
-@@ -143,7 +143,7 @@ URI_REGEXP='(file|https?|ftp)://.*'
- # unless SSH_KEY is set to point to non-root user's home (e.g. via env var).
- export SSH_KEY=${SSH_KEY:-"${HOME}/opnfv/mcp.rsa"}
+@@ -141,7 +141,7 @@ URI_REGEXP='(file|https?|ftp)://.*'
+
+ export SSH_KEY=${SSH_KEY:-"/var/lib/opnfv/mcp.rsa"}
  export SALT_MASTER=${SALT_MASTER_IP:-192.168.10.100}
 -export MAAS_IP=${MAAS_IP:-192.168.10.3}
 +export MAAS_IP=${MAAS_IP:-192.168.10.2}

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 84905a4..8ce12c3 100644 (file)
--- 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

diff --git a/patches/opnfv-fuel/0021-lib.sh-Remove-all-storage-on-undefine.patch b/patches/opnfv-fuel/0021-lib.sh-Remove-all-storage-on-undefine.patch
deleted file mode 100644 (file)
index e29daa1..0000000
--- a/patches/opnfv-fuel/0021-lib.sh-Remove-all-storage-on-undefine.patch
+++ /dev/null
@@ -1,49 +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, 7 Sep 2017 21:55:16 +0200
-Subject: [PATCH] lib.sh: Remove all storage on undefine
-
-While executing the deploy script via sudo will raise no issues with
-re-using old storage volume files, non-root deploys fail to change
-ownership of said files.
-
-Properly clean after ourselves when destroying and undefining VMs.
-
-JIRA: ARMBAND-311
-
-Change-Id: I7fdd269dccbfd5ab5285d852ac7dacfc4dc5ccd7
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- mcp/scripts/lib.sh | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
-index 884e852..f43bb08 100644
---- a/mcp/scripts/lib.sh
-+++ b/mcp/scripts/lib.sh
-@@ -43,7 +43,9 @@ cleanup_vms() {
-     virsh destroy "${node}"
-   done
-   for node in $(virsh list --name --all | grep -P '\w{3}\d{2}'); do
--    virsh undefine --nvram "${node}"
-+    virsh domblklist "${node}" | awk '/^.da/ {print $2}' | \
-+      xargs --no-run-if-empty -I{} sudo rm -f {}
-+    virsh undefine "${node}" --remove-all-storage --nvram
-   done
- }
-
-@@ -55,6 +57,7 @@ prepare_vms() {
-   cleanup_uefi
-   cleanup_vms
-   get_base_image "${base_image}" "${image_dir}"
-+  # shellcheck disable=SC2016
-   envsubst '${SALT_MASTER},${CLUSTER_DOMAIN}' < \
-     user-data.template > user-data.sh
-

diff --git a/upstream/fuel b/upstream/fuel
index ac7bb38..9131283 160000 (submodule)
--- a/upstream/fuel
+++ b/upstream/fuel
@@ -1 +1 @@
-Subproject commit ac7bb381c5376c28b0eeac880af90b50a2801f38
+Subproject commit 91312836e649c24d2d0268f1f5c8aa45fdd79a8d