reclass: Drop MaaS public IP and interface

MaaS node does not need to be exposed to the public network; instead
the management IP should be enough to access the MaaS dashboard.

So, drop 'infra_maas_node01_external_address' reclass param, together
with its OPNFV PDF param, 'opnfv_infra_maas_node01_external_address'.

This allows us to move compute public IPs back to .{2,3} instead of
.{101,102}, where we moved them during 'pod_config.yml' addition.

While at it, fix a minor duplicate 'name' param for 'br-mgmt' bridge
on kvm nodes.

Change-Id: Ie9fcf5924d7aa37b666f42c968687d73b51a8278
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit ee4d89f2803085bdd4a7f3b365e40ec9366c25a9)

diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml
index 9f1ee1d..b17816f 100644 (file)
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml
@@ -5,7 +5,6 @@ parameters:
     opnfv_infra_config_deploy_address: 10.20.0.2
     opnfv_infra_maas_node01_address: 10.167.4.3
     opnfv_infra_maas_node01_deploy_address: 192.168.11.3
-    opnfv_infra_maas_node01_external_address: 172.30.10.3
     opnfv_infra_compute_node01_address: 10.167.4.141
     opnfv_infra_compute_node02_address: 10.167.4.142
     opnfv_infra_compute_node03_address: 10.167.4.143
@@ -48,8 +47,8 @@ parameters:
     opnfv_openstack_compute_node01_tenant_address: 10.1.0.101
     opnfv_openstack_compute_node02_tenant_address: 10.1.0.102
     opnfv_openstack_compute_node03_tenant_address: 10.1.0.103
-    opnfv_openstack_compute_node01_external_address: 172.30.10.101
-    opnfv_openstack_compute_node02_external_address: 172.30.10.102
+    opnfv_openstack_compute_node01_external_address: 172.30.10.2
+    opnfv_openstack_compute_node02_external_address: 172.30.10.3
 
 
     opnfv_name_servers: ['8.8.8.8', '8.8.4.4']

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 dc164dd..29b2521 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
@@ -21,7 +21,6 @@ parameters:
     infra_config_deploy_address: 10.20.0.2
     infra_maas_node01_address: 10.167.4.3
     infra_maas_node01_deploy_address: ${_param:opnfv_maas_pxe_address}
-    infra_maas_node01_external_address: 10.16.0.3
     infra_compute_node01_address: 10.167.4.141
     infra_compute_node02_address: 10.167.4.142
     infra_compute_node03_address: 10.167.4.143

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
index c7006e7..64ae85a 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
@@ -7,7 +7,6 @@ parameters:
     dhcp_interface: ens3
     primary_interface: ens4
     pxe_interface: ens5
-    external_interface: ens6
     interface_mtu: 1500
     # MaaS has issues using MTU > 1500 for PXE interface
     pxe_interface_mtu: 1500
@@ -125,11 +124,3 @@ parameters:
           address: ${_param:single_address}
           netmask: 255.255.255.0
           type: eth
-        external_interface:
-          enabled: true
-          name: ${_param:external_interface}
-          mtu: ${_param:interface_mtu}
-          proto: static
-          address: ${_param:infra_maas_node01_external_address}
-          netmask: 255.255.255.0
-          type: eth

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 60a0b67..60b615b 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
@@ -21,7 +21,6 @@ parameters:
     infra_config_deploy_address: 10.20.0.2
     infra_maas_node01_address: 10.167.4.3
     infra_maas_node01_deploy_address: ${_param:opnfv_maas_pxe_address}
-    infra_maas_node01_external_address: 10.16.0.3
     infra_compute_node01_address: 10.167.4.141
     infra_compute_node02_address: 10.167.4.142
     infra_compute_node03_address: 10.167.4.143

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml
index 61f35f5..3f08290 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml
@@ -7,7 +7,6 @@ parameters:
     dhcp_interface: ens3
     primary_interface: ens4
     pxe_interface: ens5
-    external_interface: ens6
     interface_mtu: 1500
     # MaaS has issues using MTU > 1500 for PXE interface
     pxe_interface_mtu: 1500
@@ -125,11 +124,3 @@ parameters:
           address: ${_param:single_address}
           netmask: 255.255.255.0
           type: eth
-        external_interface:
-          enabled: true
-          name: ${_param:external_interface}
-          mtu: ${_param:interface_mtu}
-          proto: static
-          address: ${_param:infra_maas_node01_external_address}
-          netmask: 255.255.255.0
-          type: eth

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 64473fc..efb288e 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
@@ -21,7 +21,6 @@ parameters:
     infra_config_deploy_address: ${_param:reclass_config_master}
     infra_maas_node01_address: ${_param:opnfv_infra_maas_node01_address}
     infra_maas_node01_deploy_address: ${_param:opnfv_maas_pxe_address}
-    infra_maas_node01_external_address: ${_param:opnfv_infra_maas_node01_external_address}
     infra_compute_node01_address: ${_param:opnfv_infra_compute_node01_address}
     infra_compute_node02_address: ${_param:opnfv_infra_compute_node02_address}
     infra_compute_node03_address: ${_param:opnfv_infra_compute_node03_address}

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
index a8deb5d..3e9879b 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
@@ -148,7 +148,6 @@ parameters:
           - ${_param:deploy_nic}
           noifupdown: true
         mgmt-vlan:
-          name: vlan${_param:opnfv_net_mgmt_vlan}
           enabled: true
           proto: manual
           type: vlan

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
index b9d84ea..3a98fac 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
@@ -7,7 +7,6 @@ parameters:
     dhcp_interface: ens3
     primary_interface: ens4
     pxe_interface: ens5
-    external_interface: ens6
     interface_mtu: 1500
     # MaaS has issues using MTU > 1500 for PXE interface
     pxe_interface_mtu: 1500
@@ -125,11 +124,3 @@ parameters:
           address: ${_param:single_address}
           netmask: 255.255.255.0
           type: eth
-        external_interface:
-          enabled: true
-          name: ${_param:external_interface}
-          mtu: ${_param:interface_mtu}
-          proto: static
-          address: ${_param:infra_maas_node01_external_address}
-          netmask: 255.255.255.0
-          type: eth