From 3ee785abc3b36e10a5c89e879168725a135b731b Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 20 Sep 2018 19:05:14 +0200 Subject: [state] virtual_init: Limit to mas01 on baremetal `virtual_init` state file tries to ping all FN VMs, but that won't work on hybrid PODs since all FN VMs but mas01 require MaaS DHCP to be already configured (i.e. FN VMs in question will be reset after mas01 is fully configured). Limit virtual node queries in `virtual_init` to mas01 VM, as the rest of FN VMs will be handled via `baremetal_init` state. While at it, move _param:apt_mk_version def to common reclass to avoid an undef reference in NOHA hybrid deployments; set MCP_VCP to 0 for non-HA scenarios. JIRA: FUEL-385 Change-Id: I582bca6864e9bfed23baf26f9b66e6e95e986c58 Signed-off-by: Alexandru Avadanii --- ci/deploy.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'ci') diff --git a/ci/deploy.sh b/ci/deploy.sh index 103f83b9e..8e9312d98 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -278,6 +278,7 @@ generate_ssh_key export MAAS_SSH_KEY="$(cat "$(basename "${SSH_KEY}").pub")" # Expand jinja2 templates based on PDF data and env vars +[[ "${DEPLOY_SCENARIO}" =~ -ha$ ]] || MCP_VCP=0 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}" \ -- cgit 1.2.3-korg