Support configuring cinder's RPC and WSGI timeouts
New CinderRpcResponseTimeout and CinderApiWsgiTimeout parameters support configuring cinder's corresponding RPC response and WSGI connection timeouts. The default values (60s each) match the existing defaults. Change-Id: I66b472d37041f67907691f55c153ff880093e4bc (cherry picked from commit3af965d6d2
) (cherry picked from commit a14752c12a13ea48e4f4631b8a8bf48427dd4b4d) (cherry picked from commitd96f779303
)
This commit is contained in:
parent
4565ba8436
commit
cb2cb5303f
|
@ -84,6 +84,10 @@ parameters:
|
|||
e.g. { cinder-context_is_admin: { key: context_is_admin, value: 'role:admin' } }
|
||||
default: {}
|
||||
type: json
|
||||
CinderApiWsgiTimeout:
|
||||
default: 60
|
||||
description: The number of seconds until a Cinder API WSGI connection times out.
|
||||
type: number
|
||||
NotificationDriver:
|
||||
type: string
|
||||
default: 'noop'
|
||||
|
@ -219,13 +223,18 @@ outputs:
|
|||
"%{hiera('$NETWORK')}"
|
||||
params:
|
||||
$NETWORK: {get_param: [ServiceNetMap, CinderApiNetwork]}
|
||||
-
|
||||
cinder::wsgi::apache::servername:
|
||||
str_replace:
|
||||
template:
|
||||
"%{hiera('fqdn_$NETWORK')}"
|
||||
params:
|
||||
$NETWORK: {get_param: [ServiceNetMap, CinderApiNetwork]}
|
||||
cinder::wsgi::apache::vhost_custom_fragment:
|
||||
str_replace:
|
||||
template:
|
||||
"Timeout TIMEOUT"
|
||||
params:
|
||||
TIMEOUT: {get_param: CinderApiWsgiTimeout}
|
||||
-
|
||||
if:
|
||||
- cinder_workers_zero
|
||||
|
|
|
@ -93,6 +93,10 @@ parameters:
|
|||
description: >
|
||||
Cron to move deleted instances to another table - Max Delay
|
||||
default: '3600'
|
||||
CinderRpcResponseTimeout:
|
||||
default: 60
|
||||
description: Cinder's RPC response timeout, in seconds.
|
||||
type: number
|
||||
NovaPassword:
|
||||
type: string
|
||||
description: The password for the nova service and db account
|
||||
|
@ -124,6 +128,7 @@ outputs:
|
|||
- {get_param: CinderDebug }
|
||||
cinder::storage_availability_zone: {get_param: CinderStorageAvailabilityZone}
|
||||
cinder::rabbit_heartbeat_timeout_threshold: 60
|
||||
cinder::rpc_response_timeout: {get_param: CinderRpcResponseTimeout}
|
||||
cinder::db::database_db_max_retries: -1
|
||||
cinder::db::database_max_retries: -1
|
||||
cinder::cron::db_purge::minute: {get_param: CinderCronDbPurgeMinute}
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
---
|
||||
features:
|
||||
- |
|
||||
New ``CinderRpcResponseTimeout`` and ``CinderApiWsgiTimeout`` parameters
|
||||
provide a means for configuring Cinder's RPC response and WSGI connection
|
||||
timeouts, respectively.
|
Loading…
Reference in New Issue