diff options
Diffstat (limited to 'mcp/scripts/salt.sh')
| -rwxr-xr-x | mcp/scripts/salt.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index 9f88f1c77..4fa54ab1c 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -17,7 +17,7 @@ OPNFV_TMP_DIR="/home/${SALT_MASTER_USER}/fuel" OPNFV_FUEL_DIR="/root/fuel" # patch reclass-system-salt-model locally before copying it over -make -C "${F_GIT_ROOT}/mcp/patches" patches-import +make -C "${F_GIT_ROOT}/mcp/patches" deepclean patches-import # push to cfg01 current git repo first (including submodules), at ~ubuntu/fuel # later we move it to ~root/fuel and delete the temporary clone @@ -34,19 +34,21 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s << SALT_INSTALL_END while [ ! -f /var/lib/cloud/instance/boot-finished ]; do echo -n '.'; sleep 1; done echo ' done' - DEBIAN_FRONTEND=noninteractive apt-get install -y git curl - - git clone --depth=1 https://github.com/salt-formulas/salt-formulas-scripts /srv/salt/scripts + mkdir -p /srv/salt /usr/share/salt-formulas/reclass mv ${OPNFV_TMP_DIR} ${OPNFV_FUEL_DIR} && chown -R root.root ${OPNFV_FUEL_DIR} ln -s ${OPNFV_FUEL_DIR}/mcp/reclass /srv/salt/reclass + ln -s ${OPNFV_FUEL_DIR}/mcp/deploy/scripts /srv/salt/scripts - mkdir -p /usr/share/salt-formulas/reclass cp -r ${OPNFV_FUEL_DIR}/mcp/metadata/service /usr/share/salt-formulas/reclass cd /srv/salt/reclass/classes/service && \ ln -s /usr/share/salt-formulas/reclass/service/opendaylight 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 |