diff options
Diffstat (limited to 'mcp/scripts')
| -rwxr-xr-x | mcp/scripts/salt.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index e9af3363e..6a250dd67 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -29,8 +29,14 @@ 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 remote_tmp="${SSH_SALT}:$(basename "${OPNFV_TMP_DIR}")" +STORAGE_DIR=$(dirname "${LOCAL_PDF_RECLASS}") +REL_STORAGE_DIR_PATH=${STORAGE_DIR#${LOCAL_GIT_DIR}} +if [[ "${REL_STORAGE_DIR_PATH}" == "${STORAGE_DIR}" ]] +then + REL_STORAGE_DIR_PATH="" +fi rsync -Erl --delete -e "ssh ${SSH_OPTS}" \ - --exclude-from="${F_GIT_ROOT}/.gitignore" \ + --exclude={.gitignore,"$REL_STORAGE_DIR_PATH"} \ "${LOCAL_GIT_DIR}/" "${remote_tmp}/" if [ -n "${LOCAL_PDF_RECLASS}" ] && [ -f "${LOCAL_PDF_RECLASS}" ]; then rsync -e "ssh ${SSH_OPTS}" "${LOCAL_PDF_RECLASS}" \ |