openstack
/
puppet-neutron
Code Issues Proposed changes

Add OVS bridge_mac_table_size parameter 

This patch adds support for the ovs/bridge_mac_table_size parameter
in neutron-openvswitch-agent.

Change-Id: I1ba347dd142a7e9608539c12879ddedb917fcc4a
This commit is contained in:
Takashi Kajinami 2020-12-22 00:15:05 +09:00
parent c87498ac3b
commit 2314c53abf
3 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/agents/ml2/ovs.pp
View File

@ -168,6 +168,11 @@
# outgoing IP packet carrying GRE/VXLAN tunnel.
# Defaults to $::os_service_default
#
# [*bridge_mac_table_size*]
# (optional) The maximum number of MAC addresses to learn on a bridge managed
# by the Neutron OVS agent.
# Defaults to $::os_service_default
#
# [*igmp_snooping_enable*]
# (Optional) Enable IGMP snooping for integration bridge. If this
# option is set to True, support for Internet Group Management
@ -234,6 +239,7 @@ class neutron::agents::ml2::ovs (
$permitted_ethertypes = $::os_service_default,
$minimize_polling = $::os_service_default,
$tunnel_csum = $::os_service_default,
$bridge_mac_table_size = $::os_service_default,
$igmp_snooping_enable = $::os_service_default,
$resource_provider_bandwidths = [],
$resource_provider_hypervisors = [],
@ -366,6 +372,7 @@ class neutron::agents::ml2::ovs (
'ovs/datapath_type': value => $datapath_type;
'ovs/vhostuser_socket_dir': value => $vhostuser_socket_dir;
'securitygroup/enable_security_group': value => $enable_security_group;
'ovs/bridge_mac_table_size': value => $bridge_mac_table_size;
'ovs/igmp_snooping_enable': value => $igmp_snooping_enable;
}

6
releasenotes/notes/ovs-bridge_mac_table_size-b0f2305cf6008d4e.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
The ``bridge_mac_table_size`` parameter has been added to
the ``neutron::agents::ml2::ovs`` class, to support the correspoding
parameter in openvswitch_agent.ini .

11
spec/classes/neutron_agents_ml2_ovs_spec.rb
View File

@ -64,6 +64,7 @@ describe 'neutron::agents::ml2::ovs' do
should contain_neutron_agent_ovs('ovs/int_peer_patch_port').with_ensure('absent')
should contain_neutron_agent_ovs('ovs/tun_peer_patch_port').with_ensure('absent')
should contain_neutron_agent_ovs('agent/tunnel_types').with_ensure('absent')
should contain_neutron_agent_ovs('ovs/bridge_mac_table_size').with_value('<SERVICE DEFAULT>')
should contain_neutron_agent_ovs('ovs/igmp_snooping_enable').with_value('<SERVICE DEFAULT>')
should contain_neutron_agent_ovs('ovs/resource_provider_bandwidths').\
with_value('<SERVICE DEFAULT>')
@ -380,6 +381,16 @@ describe 'neutron::agents::ml2::ovs' do
end
end
context 'with mac table size on an ovs bridge set' do
before :each do
params.merge!(:bridge_mac_table_size => 50000)
end
it 'configure neutron/plugins/ml2/ml2_conf.ini' do
should contain_neutron_agent_ovs('ovs/bridge_mac_table_size').with_value(50000)
end
end
context 'with IGMP snooping enabled' do
before :each do
params.merge!(:igmp_snooping_enable => true)