diff options
Diffstat (limited to 'mcp/scripts/salt.sh')
| -rwxr-xr-x | mcp/scripts/salt.sh | 42 |
1 files changed, 27 insertions, 15 deletions
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index 03218e27f..aecfecea4 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -16,15 +16,15 @@ 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_FUEL_DIR="/root/fuel" # Should be in sync with patch.sh, scripts patches OPNFV_RDIR="reclass/classes/cluster/all-mcp-arch-common" OPNFV_VCP_IMG="mcp/scripts/base_image_opnfv_fuel_vcp.img" OPNFV_VCP_DIR="/srv/salt/env/prd/salt/files/control/images" LOCAL_GIT_DIR="${F_GIT_ROOT%${F_GIT_SUBD}}" -LOCAL_PDF_RECLASS=$1 -NODE_MASK='*' - -[[ "${CLUSTER_DOMAIN}" =~ virtual ]] || NODE_MASK='mas01*' +LOCAL_PDF_RECLASS=$1; shift +# shellcheck disable=SC2116,SC2086 +LOCAL_VIRT_NODES=$(echo ${*//cfg01/}) # unquoted to filter space +NODE_MASK="${LOCAL_VIRT_NODES// /|}" # 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 @@ -63,18 +63,25 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END 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 + ln -sf ${OPNFV_FUEL_DIR}/mcp/scripts/mcp.rsa $(dirname "${OPNFV_FUEL_DIR}") cd /srv/salt/${OPNFV_RDIR} && rm -f arch && ln -sf "\$(uname -i)" arch cp -r ${OPNFV_FUEL_DIR}/mcp/metadata/service /usr/share/salt-formulas/reclass cd /srv/salt/reclass/classes/service && \ ln -sf /usr/share/salt-formulas/reclass/service/opendaylight + # Armband APT-MK nightly/extra repo for forked & extended reclass + wget -qO - https://linux.enea.com/apt-mk/public.gpg | apt-key add - + echo 'deb http://linux.enea.com/apt-mk/xenial nightly extra' > \ + '/etc/apt/sources.list.d/armband_mcp_extra.list' + apt-get update + cd /srv/salt/scripts export DEBIAN_FRONTEND=noninteractive echo 'Dpkg::Use-Pty "0";' > /etc/apt/apt.conf.d/90silence-dpkg OLD_DOMAIN=\$(grep -sPzo "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=stable \ + MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=nightly \ EXTRA_FORMULAS="nfs" \ ./salt-master-init.sh salt-key -Ay @@ -96,21 +103,26 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END fi # Init specific to VMs on FN (all for virtual, cfg|mas for baremetal) - salt -C "${NODE_MASK} or cfg01*" saltutil.sync_all - wait_for 3.0 'salt -C "${NODE_MASK} or cfg01*" state.apply salt' wait_for 3.0 'salt -C "cfg01*" state.apply linux' + if [[ "${LOCAL_VIRT_NODES}" =~ mas ]]; then + wait_for 3.0 'salt -C "mas*" test.ping' + else + wait_for 3.0 '(for n in ${LOCAL_VIRT_NODES}; do salt -C \${n}.* test.ping || exit; done)' + fi + wait_for 3.0 'salt -C "E@^(${NODE_MASK}|cfg01).*" saltutil.sync_all' + wait_for 3.0 'salt -C "E@^(${NODE_MASK}|cfg01).*" state.apply salt' - salt -C "${NODE_MASK} and not cfg01*" state.sls linux || true - salt -C "${NODE_MASK} and not cfg01*" pkg.upgrade refresh=False + wait_for 3.0 'salt -C "E@^(${NODE_MASK}).*" state.sls linux.system,linux.storage' + wait_for 2.0 'salt -C "E@^(${NODE_MASK}).*" state.sls linux.network' || true + salt -C "E@^(${NODE_MASK}).*" state.sls opnfv.route_wrapper + salt -C "E@^(${NODE_MASK}).*" system.reboot + wait_for 90.0 'salt -C "E@^(${NODE_MASK}).*" test.ping' + wait_for 3.0 'salt -C "E@^(${NODE_MASK}).*" pkg.upgrade refresh=False dist_upgrade=True' - salt -C "${NODE_MASK} or cfg01*" state.sls ntp + wait_for 3.0 'salt -C "E@^(${NODE_MASK}|cfg01).*" state.sls ntp' if [ -f "${OPNFV_FUEL_DIR}/${OPNFV_VCP_IMG}" ]; then mkdir -p "${OPNFV_VCP_DIR}" mv "${OPNFV_FUEL_DIR}/${OPNFV_VCP_IMG}" "${OPNFV_VCP_DIR}/" fi - - # symlink manually until package with required commit is available - cd /usr/share/salt-formulas/env/aodh/files - ln -sf ocata pike SALT_INSTALL_END |