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
This commit is contained in:
Alex Schultz 2019-03-29 11:02:09 -06:00
parent d5cc8d3eaa
commit ff403bc5a0
3 changed files with 11 additions and 0 deletions

View File

@ -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;

View File

@ -0,0 +1,4 @@
---
features:
- |
Added the ability to configure rpc_response_max_timeout.

View File

@ -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('<SERVICE DEFAULT>')
should contain_neutron_config('DEFAULT/agent_down_time').with_value('<SERVICE DEFAULT>')
should contain_neutron_config('DEFAULT/enable_new_agents').with_value('<SERVICE DEFAULT>')
should contain_neutron_config('DEFAULT/router_scheduler_driver').with_value(p[:router_scheduler_driver])