From a947304aa59d287f3a1cf7aa78353e7d2e5d10d4 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Wed, 5 Feb 2020 11:00:58 +0100 Subject: [PATCH] Add OVS ovsdb_timeout parameter This adds the ovsdb_timeout to the ovs config section which is the seconds that it should try ovsdb commands before failing. [1] [1] https://github.com/openstack/neutron/blob/master/neutron/conf/agent/ovs_conf.py#L24 Conflicts: spec/classes/neutron_agents_ml2_ovs_spec.rb Change-Id: Id73e8ae40f4db67247bde36156e3b84c456b9f29 (cherry picked from commit fbafd406fcb507cb00e9e0d21dcff2eb3f6b6681) --- manifests/agents/ml2/ovs.pp | 6 ++++++ .../notes/add-ovs-ovsdb_timeout-34eb7f97e72fea46.yaml | 4 ++++ spec/classes/neutron_agents_ml2_ovs_spec.rb | 11 +++++++++++ 3 files changed, 21 insertions(+) create mode 100644 releasenotes/notes/add-ovs-ovsdb_timeout-34eb7f97e72fea46.yaml diff --git a/manifests/agents/ml2/ovs.pp b/manifests/agents/ml2/ovs.pp index d9306a8fb..45e76713c 100644 --- a/manifests/agents/ml2/ovs.pp +++ b/manifests/agents/ml2/ovs.pp @@ -42,6 +42,10 @@ # (optional) List of : # Defaults to empty list # +# [*ovsdb_timeout*] +# (Optional) The timeout in seconds for OVSDB commands. +# Defaults to $::os_service_default +# # [*integration_bridge*] # (optional) Integration bridge in OVS # Defaults to 'br-int' @@ -173,6 +177,7 @@ class neutron::agents::ml2::ovs ( $extensions = $::os_service_default, $bridge_uplinks = [], $bridge_mappings = [], + $ovsdb_timeout = $::os_service_default, $integration_bridge = 'br-int', $tunnel_types = [], $local_ip = false, @@ -302,6 +307,7 @@ class neutron::agents::ml2::ovs ( 'agent/extensions': value => join(any2array($extensions), ','); 'agent/minimize_polling': value => $minimize_polling; 'agent/tunnel_csum': value => $tunnel_csum; + 'ovs/ovsdb_timeout': value => $ovsdb_timeout; 'ovs/integration_bridge': value => $integration_bridge; 'ovs/datapath_type': value => $datapath_type; 'ovs/vhostuser_socket_dir': value => $vhostuser_socket_dir; diff --git a/releasenotes/notes/add-ovs-ovsdb_timeout-34eb7f97e72fea46.yaml b/releasenotes/notes/add-ovs-ovsdb_timeout-34eb7f97e72fea46.yaml new file mode 100644 index 000000000..0e327277a --- /dev/null +++ b/releasenotes/notes/add-ovs-ovsdb_timeout-34eb7f97e72fea46.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Added new parameter neutron::agents::ml2::ovs::ovsdb_timeout. diff --git a/spec/classes/neutron_agents_ml2_ovs_spec.rb b/spec/classes/neutron_agents_ml2_ovs_spec.rb index e4ff0db44..e08e3fe47 100644 --- a/spec/classes/neutron_agents_ml2_ovs_spec.rb +++ b/spec/classes/neutron_agents_ml2_ovs_spec.rb @@ -51,6 +51,7 @@ describe 'neutron::agents::ml2::ovs' do is_expected.to contain_neutron_agent_ovs('ovs/vhostuser_socket_dir').with_value(['']) is_expected.to contain_neutron_agent_ovs('ovs/ovsdb_interface').with_value(['']) is_expected.to contain_neutron_agent_ovs('ovs/of_interface').with_value(['']) + is_expected.to contain_neutron_agent_ovs('ovs/ovsdb_timeout').with_value(['']) 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]) @@ -194,6 +195,16 @@ describe 'neutron::agents::ml2::ovs' do end end + context 'when setting ovsdb_timeout' do + before :each do + params.merge!( :ovsdb_timeout => 30 ) + end + + it 'configures ovsdb_timeout' do + is_expected.to contain_neutron_agent_ovs('ovs/ovsdb_timeout').with_value(params[:ovsdb_timeout]) + end + end + context 'when supplying extensions for ML2 plugin' do before :each do params.merge!(:extensions => ['qos'])