diff options
| -rw-r--r-- | mcp/scripts/lib.sh | 5 | ||||
| -rw-r--r-- | mcp/scripts/user-data.template | 8 |
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 |