diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-04 23:21:44 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-04 23:24:35 +0200 |
| commit | aa31bf1127aebd6fa20b5ebabfd807fb90ba8373 (patch) | |
| tree | 199c87e122d761fc6fb93404395504eb36fdbbba | |
| parent | 993fd182dc10552d38a0f1ecab9d341f29685483 (diff) | |
u/fuel: Bump & rebase for envsubst fix
Change-Id: Ib766ce11464bd546d41dd5992527e91fdcbbb95e
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
| -rw-r--r-- | patches/opnfv-fuel/0017-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch | 4 | ||||
| m--------- | upstream/fuel | 0 |
2 files changed, 2 insertions, 2 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 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 <Alexandru.Avadanii@enea.com> 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 -Subproject 978fd9da91b6cdd522e79a4b8c31cf8f800222a +Subproject 3a76d07dbd409b781abdb8520f55a1b20edf07d |