summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-09-12 15:24:03 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-12 15:24:03 +0000
commitb30697a84ce41ee20a8b6070acda60f3a5cfac26 (patch)
treef8c403de8599b725388d06504a1c190fbaa44e04
parent284a141a9e21870ab79b0fd718d6c7ee6dfd5d57 (diff)
parent1f12aa33bc4088f846986188795fc6a41fa191e0 (diff)
Merge "salt-master-init.sh: Use stable 2016.11 salt ver"
-rwxr-xr-xmcp/scripts/salt.sh8
-rw-r--r--mcp/scripts/user-data.template2
2 files changed, 4 insertions, 6 deletions
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index 20971804d..7f2c3cac7 100755
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -45,11 +45,9 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s << SALT_INSTALL_END
cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches.list reclass
cd /srv/salt/scripts
- if [ "\$(uname -i)" = "aarch64" ]; then
- # NOTE(armband): On AArch64, skip creating apt source list definitions (-r)
- export BOOTSTRAP_SALTSTACK_OPTS=" -r -dX stable 2016.11 "
- fi
- MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=nightly ./salt-master-init.sh
+ BOOTSTRAP_SALTSTACK_OPTS=" -r -dX stable 2016.11 " \
+ MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=nightly \
+ ./salt-master-init.sh
salt-key -Ay
cp -r ${OPNFV_FUEL_DIR}/mcp/salt-formulas/* /usr/share/salt-formulas/env
diff --git a/mcp/scripts/user-data.template b/mcp/scripts/user-data.template
index 292c37c0c..7dd718e63 100644
--- a/mcp/scripts/user-data.template
+++ b/mcp/scripts/user-data.template
@@ -4,7 +4,7 @@ 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 http://${SALT_REPO} xenial main" > /etc/apt/sources.list.d/salt.list
+echo "deb https://${SALT_REPO} xenial main" > /etc/apt/sources.list.d/salt.list
apt update
apt-get install -y salt-minion
rm /etc/salt/minion_id