openstack
/
puppet-neutron
Code Issues Proposed changes

Add OVS of_inactivity_probe parameter 

This adds the of_inactivity_probe parameter for
the OVS agent. [1]

[1] https://github.com/openstack/neutron/blob/master/neutron/conf/plugins/ml2/drivers/ovs_conf.py#L125

Change-Id: I35778278f2f928f8c01f7719c9877e1e8ac89fa1
(cherry picked from commit 32bde05d8a)
This commit is contained in:
Tobias Urdin 2020-02-05 11:32:17 +01:00
parent 235c69cbc8
commit 840e1f22ab
3 changed files with 22 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

@ -46,6 +46,11 @@
# (Optional) The timeout in seconds for OVSDB commands. # (Optional) The timeout in seconds for OVSDB commands.
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# [*of_inactivity_probe*]
# (Optional) The inactivity_probe interval in second for the local switch
# connnection to the controller. A value of 0 disables inactivity probes.
# Defaults to $::os_service_default
#
# [*integration_bridge*] # [*integration_bridge*]
# (optional) Integration bridge in OVS # (optional) Integration bridge in OVS
# Defaults to 'br-int' # Defaults to 'br-int'
@ -172,6 +177,7 @@ class neutron::agents::ml2::ovs (
$bridge_uplinks = [], $bridge_uplinks = [],
$bridge_mappings = [], $bridge_mappings = [],
$ovsdb_timeout = $::os_service_default, $ovsdb_timeout = $::os_service_default,
$of_inactivity_probe = $::os_service_default,
$integration_bridge = 'br-int', $integration_bridge = 'br-int',
$tunnel_types = [], $tunnel_types = [],
$local_ip = false, $local_ip = false,
@ -297,6 +303,7 @@ class neutron::agents::ml2::ovs (
'agent/minimize_polling': value => $minimize_polling; 'agent/minimize_polling': value => $minimize_polling;
'agent/tunnel_csum': value => $tunnel_csum; 'agent/tunnel_csum': value => $tunnel_csum;
'ovs/ovsdb_timeout': value => $ovsdb_timeout; 'ovs/ovsdb_timeout': value => $ovsdb_timeout;
'ovs/of_inactivity_probe': value => $of_inactivity_probe;
'ovs/integration_bridge': value => $integration_bridge; 'ovs/integration_bridge': value => $integration_bridge;
'ovs/datapath_type': value => $datapath_type; 'ovs/datapath_type': value => $datapath_type;
'ovs/vhostuser_socket_dir': value => $vhostuser_socket_dir; 'ovs/vhostuser_socket_dir': value => $vhostuser_socket_dir;

4
releasenotes/notes/add-ovs-of_inactivity_probe-c91580cef1954de4.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- |
Added new parameter neutron::agents::ml2::ovs::of_inactivity_probe.

11
spec/classes/neutron_agents_ml2_ovs_spec.rb
View File

@ -51,6 +51,7 @@ describe 'neutron::agents::ml2::ovs' do
should contain_neutron_agent_ovs('ovs/vhostuser_socket_dir').with_value(['<SERVICE DEFAULT>']) should contain_neutron_agent_ovs('ovs/vhostuser_socket_dir').with_value(['<SERVICE DEFAULT>'])
should contain_neutron_agent_ovs('ovs/ovsdb_interface').with_value(['<SERVICE DEFAULT>']) should contain_neutron_agent_ovs('ovs/ovsdb_interface').with_value(['<SERVICE DEFAULT>'])
should contain_neutron_agent_ovs('ovs/ovsdb_timeout').with_value('<SERVICE DEFAULT>') should contain_neutron_agent_ovs('ovs/ovsdb_timeout').with_value('<SERVICE DEFAULT>')
should contain_neutron_agent_ovs('ovs/of_inactivity_probe').with_value('<SERVICE DEFAULT>')
should contain_neutron_agent_ovs('ovs/integration_bridge').with_value(p[:integration_bridge]) should contain_neutron_agent_ovs('ovs/integration_bridge').with_value(p[:integration_bridge])
should contain_neutron_agent_ovs('securitygroup/firewall_driver').\ should contain_neutron_agent_ovs('securitygroup/firewall_driver').\
with_value(p[:firewall_driver]) with_value(p[:firewall_driver])
@ -204,6 +205,16 @@ describe 'neutron::agents::ml2::ovs' do
end end
end end
context 'when setting of_inactivity_probe' do
before :each do
params.merge!( :of_inactivity_probe => 20 )
end
it 'configures of_inactivity_probe' do
should contain_neutron_agent_ovs('ovs/of_inactivity_probe').with_value(params[:of_inactivity_probe])
end
end
context 'when supplying extensions for ML2 plugin' do context 'when supplying extensions for ML2 plugin' do
before :each do before :each do
params.merge!(:extensions => ['qos']) params.merge!(:extensions => ['qos'])