user-data.template: Remove salt-minion install

salt-minion is now pre-provisioned inside the image using qemu-nbd.
Revert "lib.sh: Limit envsubst to certain variables"

This reverts commit 3a76d07dbd409b781abdb8520f55a1b20edf07db.
Change-Id: Icceb8bcf439e28ab01c7731c3602c1113290454d
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit fac41836e91dd56696c3a435bfdbc7adf53899e2)

diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
index c258b66..e32f995 100644 (file)
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -280,10 +280,7 @@ function prepare_vms {
   fi
   ln -sf "${image_dir}/${_tmp}" "${image_dir}/${image}"
 
-  # CWD should be <mcp/scripts>
-  # shellcheck disable=SC2016
-  envsubst '${SALT_MASTER},${CLUSTER_DOMAIN}' < \
-    user-data.template > user-data.sh
+  envsubst < user-data.template > user-data.sh # CWD should be <mcp/scripts>
 
   # Create config ISO and resize OS disk image for each foundation node VM
   for node in "${vnodes[@]}"; do

diff --git a/mcp/scripts/user-data.template b/mcp/scripts/user-data.template
index b654477..189310b 100644 (file)
--- a/mcp/scripts/user-data.template
+++ b/mcp/scripts/user-data.template
@@ -6,14 +6,6 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
-SALT_REPO=repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11
-if [ "$(uname -i)" = "aarch64" ]; then
-  SALT_REPO=linux.enea.com/saltstack/apt/ubuntu/16.04/arm64/2016.11
-fi
-wget -O - "https://${SALT_REPO}/SALTSTACK-GPG-KEY.pub" | sudo apt-key add -
-echo "deb https://${SALT_REPO} xenial main" > /etc/apt/sources.list.d/saltstack.list
-apt update
-apt-get install -y salt-minion
 rm /etc/salt/minion_id
 rm -f /etc/salt/pki/minion/minion_master.pub
 echo "id: $(hostname).${CLUSTER_DOMAIN}" > /etc/salt/minion