openstack
/
puppet-neutron
Code Issues Proposed changes

Merge "Add an ability to set up drop_flows_on_start option"

This commit is contained in:
Jenkins 2015-09-08 15:28:31 +00:00 committed by Gerrit Code Review
parent dd3432bbc7 c0e3a4f028
commit 4445f3aaab
2 changed files with 9 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

@ -92,6 +92,11 @@
# for distributed virtual routing.
# Defaults to false
#
# [*drop_flows_on_start*]
# (optional) Set to True to drop all flows during agent start for a clean
# flow tables resetting
# Defaults to false
#
class neutron::agents::ml2::ovs (
$package_ensure = 'present',
$enabled = true,
@ -109,6 +114,7 @@ class neutron::agents::ml2::ovs (
$arp_responder = false,
$firewall_driver = 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver',
$enable_distributed_routing = false,
$drop_flows_on_start = false,
) {
include ::neutron::params
@ -156,6 +162,7 @@ class neutron::agents::ml2::ovs (
'agent/l2_population': value => $l2_population;
'agent/arp_responder': value => $arp_responder;
'agent/enable_distributed_routing': value => $enable_distributed_routing;
'agent/drop_flows_on_start': value => $drop_flows_on_start;
'ovs/integration_bridge': value => $integration_bridge;
}

2
spec/classes/neutron_agents_ml2_ovs_spec.rb
View File

@ -18,6 +18,7 @@ describe 'neutron::agents::ml2::ovs' do
:polling_interval => 2,
:l2_population => false,
:arp_responder => false,
:drop_flows_on_start => false,
:enable_distributed_routing => false,
:firewall_driver => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver' }
end
@ -43,6 +44,7 @@ describe 'neutron::agents::ml2::ovs' do
is_expected.to contain_neutron_agent_ovs('agent/polling_interval').with_value(p[:polling_interval])
is_expected.to contain_neutron_agent_ovs('agent/l2_population').with_value(p[:l2_population])
is_expected.to contain_neutron_agent_ovs('agent/arp_responder').with_value(p[:arp_responder])
is_expected.to contain_neutron_agent_ovs('agent/drop_flows_on_start').with_value(p[:drop_flows_on_start])
is_expected.to contain_neutron_agent_ovs('ovs/integration_bridge').with_value(p[:integration_bridge])
is_expected.to contain_neutron_agent_ovs('securitygroup/firewall_driver').\
with_value(p[:firewall_driver])