From 8bb79e6beb10738d2756d8b33950452bcc44f493 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Wed, 29 Aug 2018 14:41:15 +0400 Subject: [PATCH] [noha] Align MTU settings * shift MTU from public bridge to physical interface * add neutron related settings Change-Id: Ia57d1ca7976968d6e7ee23f58a0abae1a1a256c0 Signed-off-by: Michael Polenchuk --- .../0002-Set-ovs-bridges-as-L3-interfaces.patch | 3 +-- .../classes/cluster/mcp-common-noha/openstack_control.yml | 3 +++ .../cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 | 2 +- .../classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 | 2 +- .../classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2 | 14 +++++++++++++- .../classes/cluster/mcp-ovn-noha/openstack/compute.yml.j2 | 1 + 6 files changed, 20 insertions(+), 5 deletions(-) diff --git a/mcp/patches/salt-formula-linux/0002-Set-ovs-bridges-as-L3-interfaces.patch b/mcp/patches/salt-formula-linux/0002-Set-ovs-bridges-as-L3-interfaces.patch index 5bc397586..9de6325ed 100644 --- a/mcp/patches/salt-formula-linux/0002-Set-ovs-bridges-as-L3-interfaces.patch +++ b/mcp/patches/salt-formula-linux/0002-Set-ovs-bridges-as-L3-interfaces.patch @@ -23,14 +23,13 @@ new file mode 100644 index 0000000..073c91c --- /dev/null +++ b/linux/files/ovs_bridge -@@ -0,0 +1,19 @@ +@@ -0,0 +1,18 @@ +auto {{ bridge_name }} +allow-ovs {{ bridge_name }} +iface {{ bridge_name }} inet static + ovs_type OVSBridge + address {{ bridge.address }} + netmask {{ bridge.netmask }} -+ mtu {{ bridge.get('mtu', '1500') }} + {%- if bridge.use_interfaces is defined %} + ovs_ports {{ bridge.use_interfaces|join(' ') }} + {%- endif %} 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 -- 2.16.6