diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-08-29 14:41:15 +0400 |
|---|---|---|
| committer |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-08-31 16:04:42 +0200 |
| commit | 8bb79e6beb10738d2756d8b33950452bcc44f493 (patch) | |
| tree | b82e8a4a5f250847137b2f3461bdfaebd011fbe5 /mcp/reclass/classes | |
| parent | 86dcebf4b39ff2e6b2d28691b308a571177e16a5 (diff) | |
[noha] Align MTU settings
* shift MTU from public bridge to physical interface
* add neutron related settings
Change-Id: Ia57d1ca7976968d6e7ee23f58a0abae1a1a256c0
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/reclass/classes')
5 files changed, 19 insertions, 3 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml index dbd9d0550..dd4b9c4f5 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml @@ -175,6 +175,9 @@ parameters: server: vlan_aware_vms: true root_helper_daemon: false + global_physnet_mtu: 9000 + backend: + external_mtu: 9000 apache: server: bind: diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 index ed5fb72ad..b05290480 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 @@ -42,6 +42,7 @@ parameters: ovs_port_{{ nm.ctl01.nic_public }}: enabled: true name: {{ ma.interface_str(nm.ctl01.nic_public, nm.vlan_public) }} + mtu: ${_param:interface_mtu} proto: manual ovs_port_type: OVSPort type: ovs_port @@ -50,7 +51,6 @@ parameters: br-floating: enabled: true type: ovs_bridge - mtu: ${_param:interface_mtu} proto: static address: ${_param:external_address} netmask: ${_param:opnfv_net_public_mask} diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 index fc064c183..0eb133329 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 @@ -52,6 +52,7 @@ parameters: ovs_port_{{ nm.cmp001.nic_public }}: enabled: true name: {{ ma.interface_str(nm.cmp001.nic_public, nm.vlan_public) }} + mtu: ${_param:interface_mtu} proto: manual ovs_port_type: OVSPort type: ovs_port @@ -63,7 +64,6 @@ parameters: {%- if conf.MCP_DPDK_MODE %} datapath_type: netdev {%- endif %} - mtu: ${_param:interface_mtu} proto: static address: ${_param:external_address} netmask: ${_param:opnfv_net_public_mask} diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2 index 6b445901b..0a345f42c 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2 @@ -7,7 +7,7 @@ ############################################################################## {%- import 'net_map.j2' as nm with context %} {%- import 'net_macros.j2' as ma with context %} -{%- set vlan_private_start = 0 if conf.MCP_DPDK_MODE else (nm.vlan_private | string).rsplit('-')[0] %} +{%- set vlan_private_start = (nm.vlan_private | string).rsplit('-')[0] %} --- classes: - cluster.mcp-common-noha.openstack_gateway @@ -17,6 +17,17 @@ parameters: linux: network: interface: +{%- if conf.MCP_DPDK_MODE %} + {{ nm.cmp001.nic_private }}: + ovs_bridge: br-prv + br-prv: + enabled: true + type: ovs_bridge + mtu: ${_param:interface_mtu} + proto: static + address: ${_param:tenant_address} + netmask: ${_param:opnfv_net_private_mask} +{%- else %} br-mesh: enabled: true type: bridge @@ -26,3 +37,4 @@ parameters: netmask: ${_param:opnfv_net_private_mask} use_interfaces: - {{ ma.interface_str(nm.cmp001.nic_private, vlan_private_start) }} +{%- endif %} diff --git a/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml.j2 index c7c9787f8..02411cd2c 100644 --- a/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml.j2 @@ -23,6 +23,7 @@ parameters: ovs_port_{{ nm.cmp001.nic_public }}: enabled: true name: {{ ma.interface_str(nm.cmp001.nic_public, nm.vlan_public) }} + mtu: ${_param:interface_mtu} proto: manual ovs_port_type: OVSPort type: ovs_port |