diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-08-31 02:16:08 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-09-06 15:34:44 +0200 |
| commit | f7d7eece07de9ba44a0d11c68f0685b60752e4b8 (patch) | |
| tree | d14c8715c88af6e44d5ab22c4b1a0842106858b1 /ci | |
| parent | 0b8c15936be133c6c4aeec36d57329f862f43544 (diff) | |
[submodule] Bump Pharos for maas:machines sync
Drop duplicate maas:machines definitions which could cause conflicts
in rare corner cases.
Slightly refactor j2 template expansion to make `conf.virtual.nodes`
available during first stage.
Change-Id: I04d56e346b12c6eb97da5c0c0ab1e3446e5fc1b8
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/deploy.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index f64b3b882..b7d19d883 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -267,11 +267,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_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" |