diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-29 14:16:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-29 14:16:35 +0000 |
| commit | 896908d540334f7fda329b5666c7587bca94ef4c (patch) | |
| tree | 768e5c12f0aba300b71b065d31ab64001d159e3f /mcp/scripts | |
| parent | 4a0224d6a15500d560fc2d708b0190d7027f1f37 (diff) | |
| parent | 7f9e5d2df5d8621e781bcf78dd938cac7b512435 (diff) | |
Merge "PDF parsing support" into stable/euphrates
Diffstat (limited to 'mcp/scripts')
| m--------- | mcp/scripts/pharos | 0 | ||||
| -rwxr-xr-x | mcp/scripts/salt.sh | 12 |
2 files changed, 7 insertions, 5 deletions
diff --git a/mcp/scripts/pharos b/mcp/scripts/pharos new file mode 160000 +Subproject c4b4629b59923e049500fc776b8a251d4cd4c3b diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index 4effa6b4f..081513c6b 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -13,15 +13,18 @@ F_GIT_ROOT=$(git rev-parse --show-toplevel) OPNFV_TMP_DIR="/home/${SALT_MASTER_USER}/fuel" OPNFV_FUEL_DIR="/root/fuel" - -# patch reclass-system-salt-model locally before copying it over -make -C "${F_GIT_ROOT}/mcp/patches" deepclean patches-import +OPNFV_RDIR="reclass/classes/cluster/all-mcp-ocata-common" +LOCAL_PDF_RECLASS=$1 # push to cfg01 current git repo first (including submodules), at ~ubuntu/fuel # later we move it to ~root/fuel and delete the temporary clone rsync -Erl --delete -e "ssh ${SSH_OPTS}" \ --exclude-from="${F_GIT_ROOT}/.gitignore" \ "${F_GIT_ROOT}/" "${SSH_SALT}:$(basename "${OPNFV_TMP_DIR}")/" +if [ -n "${LOCAL_PDF_RECLASS}" ] && [ -f "${LOCAL_PDF_RECLASS}" ]; then + rsync -e "ssh ${SSH_OPTS}" "${LOCAL_PDF_RECLASS}" \ + "${SSH_SALT}:$(basename "${OPNFV_TMP_DIR}")/mcp/${OPNFV_RDIR}/opnfv/" +fi # ssh to cfg01 # shellcheck disable=SC2086,2087 @@ -36,8 +39,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s << SALT_INSTALL_END mv ${OPNFV_TMP_DIR} ${OPNFV_FUEL_DIR} && chown -R root.root ${OPNFV_FUEL_DIR} ln -s ${OPNFV_FUEL_DIR}/mcp/reclass /srv/salt/reclass ln -s ${OPNFV_FUEL_DIR}/mcp/deploy/scripts /srv/salt/scripts - cd /srv/salt/reclass/classes/cluster/all-mcp-ocata-common && \ - ln -s "\$(uname -i)" arch + cd /srv/salt/${OPNFV_RDIR} && ln -s "\$(uname -i)" arch cp -r ${OPNFV_FUEL_DIR}/mcp/metadata/service /usr/share/salt-formulas/reclass cd /srv/salt/reclass/classes/service && \ |