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>

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 36056c8..603d6e5 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -140,9 +140,9 @@ OPNFV_BRIDGES=('pxebr' 'mgmt' 'internal' 'public')
 URI_REGEXP='(file|https?|ftp)://.*'
 
 export SSH_KEY=${SSH_KEY:-"/var/lib/opnfv/mcp.rsa"}
-export SALT_MASTER=${SALT_MASTER_IP:-192.168.10.100}
+export SALT_MASTER=${INSTALLER_IP:-10.20.0.2}
 export SALT_MASTER_USER=${SALT_MASTER_USER:-ubuntu}
-export MAAS_IP=${MAAS_IP:-192.168.10.3}
+export MAAS_IP=${MAAS_IP:-${SALT_MASTER%.*}.3}
 export SSH_OPTS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ${SSH_KEY}"
 export SSH_SALT="${SALT_MASTER_USER}@${SALT_MASTER}"
 

diff --git a/mcp/config/states/maas b/mcp/config/states/maas
index db0bd3f..67a7c21 100755 (executable)
--- 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"
 

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
index f1769d7..d08bdbb 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
@@ -17,7 +17,7 @@ parameters:
 
     # infra service addresses
     infra_config_address: 10.167.4.100
-    infra_config_deploy_address: 192.168.10.100
+    infra_config_deploy_address: 10.20.0.2
     infra_maas_node01_address: 10.167.4.3
     infra_maas_node01_deploy_address: 192.168.11.3
     infra_maas_node01_external_address: 10.16.0.3

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml
index 1389aef..7d029b3 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml
@@ -17,7 +17,7 @@ parameters:
 
     # infra service addresses
     infra_config_address: 10.167.4.100
-    infra_config_deploy_address: 192.168.10.100
+    infra_config_deploy_address: 10.20.0.2
     infra_maas_node01_address: 10.167.4.3
     infra_maas_node01_deploy_address: 192.168.11.3
     infra_maas_node01_external_address: 10.16.0.3

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
index d7e365a..b6261f6 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
@@ -17,7 +17,7 @@ parameters:
 
     # infra service addresses
     infra_config_address: 10.167.4.100
-    infra_config_deploy_address: 192.168.10.100
+    infra_config_deploy_address: 10.20.0.2
     infra_maas_node01_address: 10.167.4.3
     infra_maas_node01_deploy_address: 192.168.11.3
     infra_maas_node01_external_address: 10.16.0.3

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml
index d60c81d..0e3a264 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml
@@ -16,7 +16,7 @@ parameters:
     reclass_data_repository: local
     salt_master_environment_repository: "https://github.com/tcpcloud"
     salt_master_environment_revision: master
-    reclass_config_master: 192.168.10.100
+    reclass_config_master: 10.20.0.2
     single_address: 172.16.10.100
     salt_master_host: 127.0.0.1
     salt_master_base_environment: prd

diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
index e123e52..650c63b 100644 (file)
--- 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 f756ee0..6a4cfd5 100644 (file)
--- 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>