From ff403bc5a099b9372f12746b88774785c307dbf6 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Fri, 29 Mar 2019 11:02:09 -0600 Subject: [PATCH] Add rpc_response_max_timeout Allow a user to configure the rpc_response_max_timeout which is used in the backoff when rpc calls timeout. See https://review.openstack.org/#/c/623401/ Change-Id: Ibd70a580c5144ae17eb234e079e8b05f646d355e --- manifests/server.pp | 6 ++++++ .../add-rpc_response_max_timeout-9c6c8a33c0f1c376.yaml | 4 ++++ spec/classes/neutron_server_spec.rb | 1 + 3 files changed, 11 insertions(+) create mode 100644 releasenotes/notes/add-rpc_response_max_timeout-9c6c8a33c0f1c376.yaml diff --git a/manifests/server.pp b/manifests/server.pp index 98bc31ce0..8dc297fe2 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -103,6 +103,10 @@ # manages them. # Defaults to: $::os_workers # +# [*rpc_response_max_timeout*] +# (Optional) Maximum seconds to wait for a response from an RPC call +# Defaults to: $::os_service_default +# # [*agent_down_time*] # (Optional) Seconds to regard the agent as down; should be at least twice # report_interval, to be sure the agent is down for good. @@ -269,6 +273,7 @@ class neutron::server ( $sync_db = false, $api_workers = $::os_workers, $rpc_workers = $::os_workers, + $rpc_response_max_timeout = $::os_service_default, $agent_down_time = $::os_service_default, $enable_new_agents = $::os_service_default, $router_scheduler_driver = 'neutron.scheduler.l3_agent_scheduler.ChanceScheduler', @@ -398,6 +403,7 @@ class neutron::server ( 'DEFAULT/l3_ha_net_cidr': value => $l3_ha_net_cidr; 'DEFAULT/api_workers': value => $api_workers; 'DEFAULT/rpc_workers': value => $rpc_workers; + 'DEFAULT/rpc_response_max_timeout': value => $rpc_response_max_timeout; 'DEFAULT/agent_down_time': value => $agent_down_time; 'DEFAULT/enable_new_agents': value => $enable_new_agents; 'DEFAULT/router_scheduler_driver': value => $router_scheduler_driver; diff --git a/releasenotes/notes/add-rpc_response_max_timeout-9c6c8a33c0f1c376.yaml b/releasenotes/notes/add-rpc_response_max_timeout-9c6c8a33c0f1c376.yaml new file mode 100644 index 000000000..e923c65f3 --- /dev/null +++ b/releasenotes/notes/add-rpc_response_max_timeout-9c6c8a33c0f1c376.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Added the ability to configure rpc_response_max_timeout. diff --git a/spec/classes/neutron_server_spec.rb b/spec/classes/neutron_server_spec.rb index 59b15cb6f..697140dbf 100644 --- a/spec/classes/neutron_server_spec.rb +++ b/spec/classes/neutron_server_spec.rb @@ -68,6 +68,7 @@ describe 'neutron::server' do should contain_service('neutron-server').with_name('neutron-server') should contain_neutron_config('DEFAULT/api_workers').with_value(facts[:os_workers]) should contain_neutron_config('DEFAULT/rpc_workers').with_value(facts[:os_workers]) + should contain_neutron_config('DEFAULT/rpc_response_max_timeout').with_value('') should contain_neutron_config('DEFAULT/agent_down_time').with_value('') should contain_neutron_config('DEFAULT/enable_new_agents').with_value('') should contain_neutron_config('DEFAULT/router_scheduler_driver').with_value(p[:router_scheduler_driver])