From 1e7d57ed87857c65613f83532d46b5d3721174ef Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 23 Sep 2017 16:47:17 +0200 Subject: 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 (cherry picked from commit ee4d89f2803085bdd4a7f3b365e40ec9366c25a9) --- .../cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml | 1 - .../cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml | 9 --------- 2 files changed, 10 deletions(-) (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha') 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 60a0b67a4..60b615b11 100644 --- 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 61f35f5e6..3f08290f8 100644 --- 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 -- cgit 1.2.3-korg