X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fdeploy.sh;h=5026d2d8482c60b87de5b50de5519f6239b1b9c7;hb=846fa16a35f9616a34a3033bd20eb7ad767ef3e7;hp=cf166bae9f4bf017cfbc1ab93d67990e2a75d5e0;hpb=fc1425fb6ef4c6004371a8b54ee05870d446659e;p=fuel.git diff --git a/ci/deploy.sh b/ci/deploy.sh index cf166bae9..5026d2d84 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -70,10 +70,10 @@ $(notify "Input parameters to the build script are:" 2) companion should be available at: /labs//.yaml /labs//idf-.yaml - An example config is provided inside current repo in - <./mcp/config>. The default is using the git submodule tracking 'OPNFV Pharos' in <./mcp/scripts/pharos>. + An example config is provided inside current repo in + <./mcp/config>, automatically linked as <./mcp/scripts/pharos/labs/local>. -d Dry-run - Produce deploy config files, but do not execute deploy -D Debug logging - Enable extra logging in sh deploy scripts (set -x) -e Do not launch environment deployment @@ -285,6 +285,7 @@ LOCAL_PDF="${STORAGE_DIR}/$(basename "${BASE_CONFIG_PDF}")" LOCAL_IDF="${STORAGE_DIR}/$(basename "${BASE_CONFIG_IDF}")" LOCAL_PDF_RECLASS="${STORAGE_DIR}/pod_config.yml" rm -f "${LOCAL_PDF_RECLASS}" +ln -sf "$(readlink -f "../config/labs/local")" "./pharos/labs/" if ! curl --create-dirs -o "${LOCAL_PDF}" "${BASE_CONFIG_PDF}"; then if [ "${DEPLOY_TYPE}" = 'baremetal' ]; then notify "[ERROR] Could not retrieve PDF (Pod Descriptor File)!\n" 1>&2