aboutsummaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-06 21:13:31 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-07 02:09:38 +0100
commitfac41836e91dd56696c3a435bfdbc7adf53899e2 (patch)
tree18aeb9d8ea7e47a51178a4ba5d0696705b707099 /mcp
parent1815bdaf0c1765cc1fcb48031f8291409861b0b2 (diff)
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>
Diffstat (limited to 'mcp')
-rw-r--r--mcp/scripts/lib.sh5
-rw-r--r--mcp/scripts/user-data.template8
2 files changed, 1 insertions, 12 deletions
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
index e9ce1e53a..63a5adc5a 100644
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -281,10 +281,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 b6544774c..189310be4 100644
--- 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