diff options
Diffstat (limited to 'mcp/scripts')
| -rwxr-xr-x | mcp/scripts/salt.sh | 50 |
1 files changed, 38 insertions, 12 deletions
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index a03d25fc4..ab096f3ee 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -12,19 +12,27 @@ CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x F_GIT_ROOT=$(git rev-parse --show-toplevel) -OPNFV_TMP_DIR="/home/${SALT_MASTER_USER}/fuel" +F_GIT_DIR=$(cd "${F_GIT_ROOT}/mcp" && git rev-parse --git-dir) +F_GIT_SUBD=${F_GIT_ROOT#${F_GIT_DIR%%/.git*}} +OPNFV_TMP_DIR="/home/${SALT_MASTER_USER}/opnfv" +OPNFV_GIT_DIR="/root/opnfv" OPNFV_FUEL_DIR="/root/fuel" OPNFV_RDIR="reclass/classes/cluster/all-mcp-ocata-common" +LOCAL_GIT_DIR="${F_GIT_ROOT%${F_GIT_SUBD}}" LOCAL_PDF_RECLASS=$1 +NODE_MASK='*' -# push to cfg01 current git repo first (including submodules), at ~ubuntu/fuel -# later we move it to ~root/fuel and delete the temporary clone +[[ "${CLUSTER_DOMAIN}" =~ virtual ]] || NODE_MASK='mas01*' + +# push to cfg01 current git repo first (including submodules), at ~ubuntu/opnfv +# later we move it to ~root/opnfv (and ln as ~root/fuel); delete the temp clone +remote_tmp="${SSH_SALT}:$(basename "${OPNFV_TMP_DIR}")" rsync -Erl --delete -e "ssh ${SSH_OPTS}" \ --exclude-from="${F_GIT_ROOT}/.gitignore" \ - "${F_GIT_ROOT}/" "${SSH_SALT}:$(basename "${OPNFV_TMP_DIR}")/" + "${LOCAL_GIT_DIR}/" "${remote_tmp}/" if [ -n "${LOCAL_PDF_RECLASS}" ] && [ -f "${LOCAL_PDF_RECLASS}" ]; then rsync -e "ssh ${SSH_OPTS}" "${LOCAL_PDF_RECLASS}" \ - "${SSH_SALT}:$(basename "${OPNFV_TMP_DIR}")/mcp/${OPNFV_RDIR}/opnfv/" + "${remote_tmp}${F_GIT_SUBD}/mcp/${OPNFV_RDIR}/opnfv/" fi # ssh to cfg01 @@ -32,14 +40,19 @@ fi ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END sudo -i set -e + export CI_DEBUG=${CI_DEBUG}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x 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' mkdir -p /srv/salt /usr/share/salt-formulas/reclass - rm -rf ${OPNFV_FUEL_DIR} - mv ${OPNFV_TMP_DIR} ${OPNFV_FUEL_DIR} && chown -R root.root ${OPNFV_FUEL_DIR} + rm -rf ${OPNFV_GIT_DIR} + mv ${OPNFV_TMP_DIR} ${OPNFV_GIT_DIR} && chown -R root.root ${OPNFV_GIT_DIR} + find ${OPNFV_GIT_DIR} -name '.git' -type f | while read f_git; do + sed -i 's@${LOCAL_GIT_DIR}@${OPNFV_GIT_DIR}@g' \$f_git + done + ln -sf ${OPNFV_GIT_DIR}${F_GIT_SUBD} ${OPNFV_FUEL_DIR} ln -sf ${OPNFV_FUEL_DIR}/mcp/reclass /srv/salt ln -sf ${OPNFV_FUEL_DIR}/mcp/deploy/scripts /srv/salt cd /srv/salt/${OPNFV_RDIR} && rm -f arch && ln -sf "\$(uname -i)" arch @@ -50,6 +63,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END cd /srv/salt/scripts export DEBIAN_FRONTEND=noninteractive + OLD_DOMAIN=\$(grep -Pzo "id: cfg01\.\K(\S*)" /etc/salt/minion.d/minion.conf) || true BOOTSTRAP_SALTSTACK_OPTS=" -r -dX stable 2016.11 " \ MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=nightly \ EXTRA_FORMULAS="nfs" \ @@ -61,12 +75,24 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches.list reclass salt-call state.apply salt - salt '*' saltutil.sync_all - salt '*' state.apply salt | grep -Fq 'No response' && salt '*' state.apply salt + + # In case scenario changed (and implicitly domain name), re-register minions + if [ -n "\${OLD_DOMAIN}" ] && [ "\${OLD_DOMAIN}" != "${CLUSTER_DOMAIN}" ]; then + salt "*.\${OLD_DOMAIN}" cmd.run "grep \${OLD_DOMAIN} -Rl /etc/salt | \ + xargs --no-run-if-empty sed -i 's/\${OLD_DOMAIN}/${CLUSTER_DOMAIN}/g'; \ + service salt-minion restart" || true + salt-key -yd "*.\${OLD_DOMAIN}" + salt-key -Ay + fi + + # Init specific to VMs on FN (all for virtual, cfg|mas for baremetal) + salt -C "${NODE_MASK} or cfg01*" saltutil.sync_all + salt -C "${NODE_MASK} or cfg01*" state.apply salt | \ + grep -Fq 'No response' && salt -C "${NODE_MASK} or cfg01*" state.apply salt salt -C 'I@salt:master' state.sls linux - salt -C '* and not cfg01*' state.sls linux || true - salt -C '* and not cfg01*' pkg.upgrade refresh=False + salt -C "${NODE_MASK} and not cfg01*" state.sls linux || true + salt -C "${NODE_MASK} and not cfg01*" pkg.upgrade refresh=False - salt '*' state.sls ntp + salt -C "${NODE_MASK} or cfg01*" state.sls ntp SALT_INSTALL_END |