From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Mon, 4 Sep 2017 21:18:31 +0000 (+0200)
Subject: lib.sh: Limit envsubst to certain variables
X-Git-Tag: opnfv-5.0.RC1~93
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F23%2F41023%2F1;p=fuel.git

lib.sh: Limit envsubst to certain variables

This will prevent envsubst from expanding the SALT_REPO local
variable in user-data.template.

Change-Id: Idcc3ea827293ac0d3b4059776f90bbbcf807daec
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---

diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
index 3f740589d..67c960a6e 100644
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -41,7 +41,8 @@ prepare_vms() {
 
   cleanup_vms
   get_base_image "${base_image}"
-  envsubst < user-data.template > user-data.sh
+  envsubst '${SALT_MASTER},${CLUSTER_DOMAIN}' < \
+    user-data.template > user-data.sh
 
   for node in "${vnodes[@]}"; do
     # create/prepare images