diff options
Diffstat (limited to 'mcp/scripts')
| -rwxr-xr-x | mcp/scripts/salt.sh | 44 |
1 files changed, 34 insertions, 10 deletions
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index 4c6cbf782..3d0fb9117 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -1,34 +1,58 @@ #!/bin/bash +############################################################################## +# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## # # Deploy Salt Master # +F_GIT_ROOT=$(git rev-parse --show-toplevel) +SALT_MASTER_USER=${SALT_MASTER_USER:-ubuntu} +SSH_SALT="${SALT_MASTER_USER}@${SALT_MASTER}" +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 + +# push to cfg01 current git repo first (including submodules), at ~ubuntu/fuel +# later we move it to ~root/fuel and delete the temporary clone +rsync -Erl --delete -e "ssh ${SSH_OPTS}" \ + --exclude-from="${F_GIT_ROOT}/.gitignore" \ + "${F_GIT_ROOT}/" "${SSH_SALT}:$(basename "${OPNFV_TMP_DIR}")/" + # ssh to cfg01 # shellcheck disable=SC2086,2087 -ssh ${SSH_OPTS} "ubuntu@${SALT_MASTER}" bash -s << SALT_INSTALL_END +ssh ${SSH_OPTS} "${SSH_SALT}" bash -s << SALT_INSTALL_END sudo -i echo -n 'Checking out cloud-init has finished running ...' while [ ! -f /var/lib/cloud/instance/boot-finished ]; do echo -n '.'; sleep 1; done echo ' done' - apt-get install -y git curl subversion + DEBIAN_FRONTEND=noninteractive apt-get install -y git curl subversion - svn export --force https://github.com/salt-formulas/salt-formulas/trunk/deploy/scripts /srv/salt/scripts - git clone --depth=1 --recurse-submodules https://git.opnfv.org/fuel - ln -s /root/fuel/mcp/reclass /srv/salt/reclass + svn export --force \ + https://github.com/salt-formulas/salt-formulas/trunk/deploy/scripts /srv/salt/scripts + mv ${OPNFV_TMP_DIR} ${OPNFV_FUEL_DIR} && chown -R root.root ${OPNFV_FUEL_DIR} + ln -s ${OPNFV_FUEL_DIR}/mcp/reclass /srv/salt/reclass mkdir -p /usr/share/salt-formulas/reclass - cp -r /root/fuel/mcp/metadata/service /usr/share/salt-formulas/reclass - cd /srv/salt/reclass/classes/service && ln -s /usr/share/salt-formulas/reclass/service/opendaylight - cd /root/fuel/mcp/patches && ./patch.sh patches.list 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 MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=nightly ./salt-master-init.sh salt-key -Ay - cp -r /root/fuel/mcp/salt-formulas/* /usr/share/salt-formulas/env - cd /root/fuel/mcp/patches && ./patch.sh patches.list formulas + cp -r ${OPNFV_FUEL_DIR}/mcp/salt-formulas/* /usr/share/salt-formulas/env + cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches.list formulas salt-call state.apply salt salt '*' state.apply salt | fgrep -q 'No response' && salt '*' state.apply salt |