From: Alexandru Avadanii Date: Mon, 4 Sep 2017 21:21:44 +0000 (+0200) Subject: u/fuel: Bump & rebase for envsubst fix X-Git-Tag: opnfv-5.0.RC1~41 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F25%2F41025%2F1;p=armband.git u/fuel: Bump & rebase for envsubst fix Change-Id: Ib766ce11464bd546d41dd5992527e91fdcbbb95e Signed-off-by: Alexandru Avadanii --- 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 7f9c4a23..39ff8438 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 1 file changed, 10 insertions(+) diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh -index 3f74058..5389ced 100644 +index 67c960a..ce217e9 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -25,6 +25,15 @@ get_base_image() { @@ -57,4 +57,4 @@ index 3f74058..5389ced 100644 + cleanup_uefi cleanup_vms get_base_image "${base_image}" - envsubst < user-data.template > user-data.sh + envsubst '${SALT_MASTER},${CLUSTER_DOMAIN}' < \ diff --git a/upstream/fuel b/upstream/fuel index 978fd9da..3a76d07d 160000 --- a/upstream/fuel +++ b/upstream/fuel @@ -1 +1 @@ -Subproject commit 978fd9da91b6cdd522e79a4b8c31cf8f800222a3 +Subproject commit 3a76d07dbd409b781abdb8520f55a1b20edf07db