summaryrefslogtreecommitdiffstats
path: root/mcp/config
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-09-10 22:04:58 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-09-11 19:13:20 +0200
commita760c973e420371b07ac1739ba2d32a1df87226f (patch)
tree851260c1f5d6f9efec3195085f5f742c0bde4620 /mcp/config
parentc2269d2ed4f55ec051c058dc6b733f74d0d3eec3 (diff)
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 <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/config')
-rwxr-xr-xmcp/config/states/maas2
1 files changed, 1 insertions, 1 deletions
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"