diff options
Diffstat (limited to 'mcp/scripts')
| -rw-r--r-- | mcp/scripts/lib.sh | 3 | ||||
| -rwxr-xr-x | mcp/scripts/salt.sh | 4 | ||||
| -rw-r--r-- | mcp/scripts/user-data.template | 8 |
3 files changed, 12 insertions, 3 deletions
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh index 3f740589d..67c960a6e 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -41,7 +41,8 @@ prepare_vms() { cleanup_vms get_base_image "${base_image}" - envsubst < user-data.template > user-data.sh + envsubst '${SALT_MASTER},${CLUSTER_DOMAIN}' < \ + user-data.template > user-data.sh for node in "${vnodes[@]}"; do # create/prepare images diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index 8a7545db8..4fa54ab1c 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 diff --git a/mcp/scripts/user-data.template b/mcp/scripts/user-data.template index cc97a6027..292c37c0c 100644 --- a/mcp/scripts/user-data.template +++ b/mcp/scripts/user-data.template @@ -1,6 +1,10 @@ #!/bin/bash -wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11/SALTSTACK-GPG-KEY.pub | sudo apt-key add - -echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11 xenial main" > /etc/apt/sources.list.d/salt.list +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 http://${SALT_REPO} xenial main" > /etc/apt/sources.list.d/salt.list apt update apt-get install -y salt-minion rm /etc/salt/minion_id |