Browse Source

Add ovs/igmp_snooping_enable support

This patch is adding support to the "ovs/igmp_snooping_enable"
configuration option in the ml2_conf.ini configuration file.

Conflicts:
      spec/classes/neutron_agents_ml2_ovs_spec.rb

Related-Bug: #1868569

Change-Id: I1d96899de29cdd994f2a45b701923b0177a7edd8
Signed-off-by: Lucas Alvares Gomes <lucasagomes@gmail.com>
(cherry picked from commit 382352a893)
(cherry picked from commit 4d5fd04844)
changes/74/773374/1
Lucas Alvares Gomes 2 years ago
committed by Rodolfo Alonso Hernandez
parent
commit
6e4f4e93af
  1. 14
      manifests/agents/ml2/ovs.pp
  2. 11
      spec/classes/neutron_agents_ml2_ovs_spec.rb

14
manifests/agents/ml2/ovs.pp

@ -179,6 +179,18 @@
# final egress tables direct output flows for unicast traffic. (boolean value)
# 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
# Protocol (IGMP) is enabled in integration bridge.
# Setting this option to True will also enable Open vSwitch
# mcast-snooping-disable-flood-unregistered flag. This option will
# disable flooding of unregistered multicast packets to all ports.
# The switch will send unregistered multicast packets only to ports
# connected to multicast routers. This option is used by the ML2/OVS
# mechanism driver for Neutron.
# Defaults to $::os_service_default
#
# DEPRECATED
#
# [*of_interface*]
@ -219,6 +231,7 @@ class neutron::agents::ml2::ovs (
$minimize_polling = $::os_service_default,
$tunnel_csum = $::os_service_default,
$explicitly_egress_direct = $::os_service_default,
$igmp_snooping_enable = $::os_service_default,
# DEPRECATED
$of_interface = undef,
) {
@ -331,6 +344,7 @@ class neutron::agents::ml2::ovs (
'ovs/ovsdb_interface': value => $ovsdb_interface;
'ovs/of_interface': value => $of_interface;
'securitygroup/enable_security_group': value => $enable_security_group;
'ovs/igmp_snooping_enable': value => $igmp_snooping_enable;
}
if $firewall_driver {

11
spec/classes/neutron_agents_ml2_ovs_spec.rb

@ -66,6 +66,7 @@ describe 'neutron::agents::ml2::ovs' do
is_expected.to contain_neutron_agent_ovs('ovs/tun_peer_patch_port').with_ensure('absent')
is_expected.to contain_neutron_agent_ovs('agent/tunnel_types').with_ensure('absent')
is_expected.to contain_neutron_agent_ovs('agent/explicitly_egress_direct').with_value(['<SERVICE DEFAULT>'])
is_expected.to contain_neutron_agent_ovs('ovs/igmp_snooping_enable').with_value(['<SERVICE DEFAULT>'])
end
it 'installs neutron ovs agent package' do
@ -387,6 +388,16 @@ describe 'neutron::agents::ml2::ovs' do
end
end
context 'with IGMP snooping enabled' do
before :each do
params.merge!(:igmp_snooping_enable => true)
end
it 'configure neutron/plugins/ml2/ml2_conf.ini' do
should contain_neutron_agent_ovs('ovs/igmp_snooping_enable').with_value(true)
end
end
end
on_supported_os({

Loading…
Cancel
Save