diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-09-19 11:27:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-09-19 11:27:16 +0000 |
| commit | 140f2f31083b58cf7bfd0900c0ad402bb13a7d7e (patch) | |
| tree | 510ebea62d2c8fda9a21a31280fa4a89c672ce2c /ci | |
| parent | beab14192ba234803bf2032af6cf190dfa6b25a8 (diff) | |
| parent | 3c1b3b70f0b2ca6a4de2141e9e195366212d2c6b (diff) | |
Merge "Use common way to detect dpdk feature"
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/deploy.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 4b6b916ac..103f83b9e 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -277,10 +277,9 @@ fi generate_ssh_key export MAAS_SSH_KEY="$(cat "$(basename "${SSH_KEY}").pub")" -MCP_DPDK_MODE=$([[ "$DEPLOY_SCENARIO" =~ ovs ]] && echo 1 || echo 0) # Expand jinja2 templates based on PDF data and env vars -export MCP_REPO_ROOT_PATH MCP_VCP MCP_DPDK_MODE MCP_STORAGE_DIR MCP_DOCKER_TAG \ - MCP_CMP_SS MCP_JUMP_ARCH=$(uname -i) +export MCP_REPO_ROOT_PATH MCP_VCP MCP_STORAGE_DIR MCP_DOCKER_TAG MCP_CMP_SS \ + MCP_JUMP_ARCH=$(uname -i) MCP_DEPLOY_SCENARIO="${DEPLOY_SCENARIO}" do_templates_scenario "${MCP_STORAGE_DIR}" "${TARGET_LAB}" "${TARGET_POD}" \ "${BASE_CONFIG_URI}" "${SCENARIO_DIR}" \ "${SCENARIO_DIR}/${DEPLOY_SCENARIO}.yaml" |