From 6a997a36d07d9a3256139e3faea057ac54ddafd4 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 20 Sep 2018 15:57:08 +0200 Subject: [infra] Bind mas01 mcpcontrol DHCP to MAAS_IP Bring back MAAS_IP global env var and use it for mas01 VM IP addr in mcpcontrol network to prevent salt minion signature change. Partially-reverts: b666bc50 Change-Id: I5c7668393fe66287bd3ecdc75dd3195d5a89a8f3 Signed-off-by: Alexandru Avadanii --- mcp/scripts/globals.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'mcp/scripts/globals.sh') diff --git a/mcp/scripts/globals.sh b/mcp/scripts/globals.sh index d95448d45..629bac8ca 100644 --- a/mcp/scripts/globals.sh +++ b/mcp/scripts/globals.sh @@ -16,6 +16,7 @@ export SALT_MASTER_USER=${SALT_MASTER_USER:-ubuntu} # Derived from INSTALLER_IP export MCPCONTROL_NET=${MCPCONTROL_NET:-${SALT_MASTER%.*}.0} export MCPCONTROL_PREFIX=${MCPCONTROL_PREFIX:-24} +export MAAS_IP=${MAAS_IP:-${SALT_MASTER%.*}.3} # Derived from above global vars, not overideable export SSH_OPTS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ${SSH_KEY}" -- cgit 1.2.3-korg