[salt.sh] Ignoring files using rsync

[fuel.git] / mcp / scripts / salt.sh

diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index 9288f97..dc2226e 100755 (executable)
--- 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}" \
@@ -80,7 +86,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END
   echo 'Dpkg::Use-Pty "0";' > /etc/apt/apt.conf.d/90silence-dpkg
   OLD_DOMAIN=\$(grep -sPzo "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=testing \
+    MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=nightly \
       EXTRA_FORMULAS="nfs panko gnocchi oslo-templates" \
         ./salt-master-init.sh
   salt-key -Ay