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:49:40 +0100 |
| commit | 2b7d2584b3749dab03e1f6a099d3b26b43326cc4 (patch) | |
| tree | 7c91457d59599bfee0bfcee164e7c342c6dd855c /mcp/scripts/salt.sh | |
| parent | 2d347e8fd382bbb99c9747328e41734b331f745c (diff) | |
reclass: apt_mk_version: 2017.12
Although previous commit e3bc5ad changed the first reference of
apt-mk repos to '2017.12' from 'nightly', it missed the cluster model.
This fixes redeploys with `-f`, which fail due to conflicts between
already installed '2017.12' packages and 'nightly' ones.
Fixes: e3bc5ad
Change-Id: I854bac86feaaa61da0b68d158e270eec1ee0ccb7
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/scripts/salt.sh')
| -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 ac9d74f35..72c050285 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 |