aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/scripts/salt.sh
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/scripts/salt.sh')
-rwxr-xr-xmcp/scripts/salt.sh8
1 files changed, 3 insertions, 5 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