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"
+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}}"
echo ' done'
mkdir -p /srv/salt /usr/share/salt-formulas/reclass
- rm -rf ${OPNFV_GIT_DIR}
+ rm -rf ${OPNFV_GIT_DIR} ${OPNFV_FUEL_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
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 \
+ MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=stable \
EXTRA_FORMULAS="nfs" \
./salt-master-init.sh
salt-key -Ay
cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches.list formulas
cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches.list reclass
- salt-call state.apply salt
+ source ${OPNFV_FUEL_DIR}/mcp/scripts/lib.sh
+ wait_for 3.0 "salt-call state.apply salt"
# In case scenario changed (and implicitly domain name), re-register minions
if [ -n "\${OLD_DOMAIN}" ] && [ "\${OLD_DOMAIN}" != "${CLUSTER_DOMAIN}" ]; then
# 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
+ wait_for 3.0 'salt -C "${NODE_MASK} or cfg01*" state.apply salt'
+ wait_for 3.0 'salt -C "cfg01*" state.apply linux'
- salt -C 'I@salt:master' state.sls linux
salt -C "${NODE_MASK} and not cfg01*" state.sls linux || true
salt -C "${NODE_MASK} and not cfg01*" pkg.upgrade refresh=False
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