From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Mon, 10 Sep 2018 15:42:04 +0000 (+0000)
Subject: Merge "[nosdn-noha] Meet EPA testcases requirements (NUMA)"
X-Git-Tag: opnfv-7.0.0~55
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d33f39782f945cae306ce44eead411ff9301a813;p=fuel.git

Merge "[nosdn-noha] Meet EPA testcases requirements (NUMA)"
---

d33f39782f945cae306ce44eead411ff9301a813
diff --cc ci/deploy.sh
index 672237205,ede930b82..5aa6c66b1
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@@ -266,13 -275,13 +275,13 @@@ export MAAS_SSH_KEY="$(cat "$(basename 
  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_JUMP_ARCH=$(uname -i)
+        MCP_CMP_SS 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"