aboutsummaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-09-19 11:52:15 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2018-09-19 11:58:15 +0400
commit3c1b3b70f0b2ca6a4de2141e9e195366212d2c6b (patch)
tree9517f42a000537ff9f73194a8eba14aa21c559af /ci
parentc57d4c9a8e26c7dcb8f9f1b98c5b5d6d668750a3 (diff)
Use common way to detect dpdk feature
Change-Id: I55a3c10f275079b11b7456b28a2c846cb33c204a Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 8baacfab0..8a7ff13d7 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -272,10 +272,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"