From 4563ea7d62238e8273d840a8d9c6c1e179ca584e Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 21 Jan 2018 03:35:46 +0100 Subject: reclass: apt_mk_version: stable Although previous commit d1b6119 changed the first reference of apt-mk repos to 'stable' from 'nightly', it missed the cluster model. This fixes redeploys with `-f`, which fail due to conflicts between already installed 'stable' packages and 'nightly' ones. Fixes: d1b6119 Change-Id: I854bac86feaaa61da0b68d158e270eec1ee0ccb7 Signed-off-by: Alexandru Avadanii --- mcp/scripts/salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mcp/scripts') diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index a13194363..1975f9e54 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -54,7 +54,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END 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 -- cgit 1.2.3-korg