diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-21 03:35:46 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-21 05:48:40 +0100 |
| commit | 4563ea7d62238e8273d840a8d9c6c1e179ca584e (patch) | |
| tree | b202b22e0f71f2139815caa6adb1ce35684074e6 /mcp/scripts | |
| parent | d06bcfb72c44b507c3efee4de00f415869f48450 (diff) | |
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 <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/scripts')
| -rwxr-xr-x | mcp/scripts/salt.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |