From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Mon, 10 Sep 2018 14:56:30 +0000 (+0000)
Subject: Merge "[submodule] Bump Pharos for maas:machines sync"
X-Git-Tag: opnfv-7.0.0~56
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=531ca8731f9b61e79131bcfab420742b4fe3b494;p=fuel.git

Merge "[submodule] Bump Pharos for maas:machines sync"
---

531ca8731f9b61e79131bcfab420742b4fe3b494
diff --cc ci/deploy.sh
index 4a85412e1,b7d19d883..672237205
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@@ -265,14 -264,14 +265,14 @@@ 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 \
 +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"