diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-23 16:47:17 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-23 21:54:20 +0000 |
| commit | 1e7d57ed87857c65613f83532d46b5d3721174ef (patch) | |
| tree | 58d66bdaa11c9844cf5f29523bacc73cad1f4923 /mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha | |
| parent | 3a6f5b7ace228900218f2833905872356ed9ae03 (diff) | |
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)
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha')
3 files changed, 0 insertions, 11 deletions
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 64473fcb1..efb288e77 100644 --- 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 a8deb5de0..3e9879b43 100644 --- 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 b9d84eaff..3a98fac2a 100644 --- 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 |