diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-10 22:04:58 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-11 19:13:20 +0200 |
| commit | a760c973e420371b07ac1739ba2d32a1df87226f (patch) | |
| tree | 851260c1f5d6f9efec3195085f5f742c0bde4620 /mcp/scripts | |
| parent | c2269d2ed4f55ec051c058dc6b733f74d0d3eec3 (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/scripts')
| -rw-r--r-- | mcp/scripts/lib.sh | 3 | ||||
| -rw-r--r-- | mcp/scripts/net_mcpcontrol.xml | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh index e123e5231..650c63b16 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -65,7 +65,8 @@ create_networks() { # create required networks, including constant "mcpcontrol" # FIXME(alav): since we renamed "pxe" to "mcpcontrol", we need to make sure # we delete the old "pxe" virtual network, or it would cause IP conflicts. - for net in "pxe" "mcpcontrol" "${vnode_networks[@]}"; do + # FIXME(alav): The same applies for "fuel1" virsh network. + for net in "fuel1" "pxe" "mcpcontrol" "${vnode_networks[@]}"; do if virsh net-info "${net}" >/dev/null 2>&1; then virsh net-destroy "${net}" || true virsh net-undefine "${net}" diff --git a/mcp/scripts/net_mcpcontrol.xml b/mcp/scripts/net_mcpcontrol.xml index f756ee0ae..6a4cfd5b0 100644 --- a/mcp/scripts/net_mcpcontrol.xml +++ b/mcp/scripts/net_mcpcontrol.xml @@ -2,9 +2,9 @@ <name>mcpcontrol</name> <bridge name="mcpcontrol"/> <forward mode="nat"/> - <ip address="192.168.10.1" netmask="255.255.255.0"> + <ip address="10.20.0.1" netmask="255.255.255.0"> <dhcp> - <range start="192.168.10.100" end="192.168.10.254"/> + <range start="10.20.0.2" end="10.20.0.254"/> </dhcp> </ip> </network> |