diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-04 16:41:43 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-09-04 16:41:43 +0000 |
commit | 978fd9da91b6cdd522e79a4b8c31cf8f800222a3 (patch) | |
tree | ad7ce00712ea2d93d31491870c796c5613c8bc0f /mcp/scripts/salt.sh | |
parent | 405d814aa17b6cb52bf2fd26c1fec62679e8ff5e (diff) | |
parent | bb2dc1e4d661b51c561a60530639ba439d824870 (diff) |
Merge "salt.sh, user-data: Add Saltstack arm64 repo"
Diffstat (limited to 'mcp/scripts/salt.sh')
-rwxr-xr-x | mcp/scripts/salt.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index b291b0f7c..70b5757a8 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -45,6 +45,10 @@ 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 salt-key -Ay |