aboutsummaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-09-10 14:56:30 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-09-10 14:56:30 +0000
commit531ca8731f9b61e79131bcfab420742b4fe3b494 (patch)
treed4cc0c36e2d09f50b528069b693d5a08c8677ea8 /ci
parent546d3927a8ecd822b319a8eac1f98983df63eb3a (diff)
parentf7d7eece07de9ba44a0d11c68f0685b60752e4b8 (diff)
Merge "[submodule] Bump Pharos for maas:machines sync"
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 4a85412e1..672237205 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -268,11 +268,11 @@ MCP_DPDK_MODE=$([[ "$DEPLOY_SCENARIO" =~ ovs ]] && echo 1 || echo 0)
export MCP_REPO_ROOT_PATH MCP_VCP MCP_DPDK_MODE MCP_STORAGE_DIR MCP_DOCKER_TAG \
MCP_JUMP_ARCH=$(uname -i)
do_templates_scenario "${MCP_STORAGE_DIR}" "${TARGET_LAB}" "${TARGET_POD}" \
- "${BASE_CONFIG_URI}" "${SCENARIO_DIR}"
+ "${BASE_CONFIG_URI}" "${SCENARIO_DIR}" \
+ "${SCENARIO_DIR}/${DEPLOY_SCENARIO}.yaml"
do_templates_cluster "${MCP_STORAGE_DIR}" "${TARGET_LAB}" "${TARGET_POD}" \
"${MCP_REPO_ROOT_PATH}" \
- "${SCENARIO_DIR}/defaults.yaml" \
- "${SCENARIO_DIR}/${DEPLOY_SCENARIO}.yaml"
+ "${SCENARIO_DIR}/defaults.yaml"
# Determine additional data (e.g. jump bridge names) based on XDF
source "${DEPLOY_DIR}/xdf_data.sh"