From a760c973e420371b07ac1739ba2d32a1df87226f Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 10 Sep 2017 22:04:58 +0200 Subject: salt master, maas: Move mcpcontrol to 10.20.0.0/24 Use INSTALLER_IP Jenkins param instead of SALT_MASTER_IP, allowing us to drop SALT_MASTER_IP completely from releng. mcpcontrol IP changes: - 192.168.10.100 becomes 10.20.0.2 (align with legacy Fuel master); - 192.168.10.3 becomes 10.20.0.3 (baremetal MaaS address); JIRA: FUEL-285 Change-Id: I6e2d44c3a8b43846196bd64191735214167a76ce Signed-off-by: Alexandru Avadanii --- mcp/config/states/maas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mcp/config/states/maas') diff --git a/mcp/config/states/maas b/mcp/config/states/maas index db0bd3fe6..67a7c213a 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas @@ -57,7 +57,7 @@ salt -C 'mas01*' state.apply linux.network.interface salt -C 'mas01*' state.apply maas.pxe_nat salt -C 'mas01*' state.apply maas.cluster salt -C 'cfg01*' cmd.run \ - "route add -net 192.168.11.0/24 gw ${MAAS_IP:-192.168.10.3}" + "route add -net 192.168.11.0/24 gw ${MAAS_IP:-10.20.0.3}" wait_for 10 "salt -C 'mas01*' state.apply maas.region" -- cgit 1.2.3-korg