Merge "Support configuring cinder's RPC and WSGI timeouts" into stable/victoria
This commit is contained in:
commit
151bb77f46
|
@ -80,6 +80,10 @@ parameters:
|
||||||
e.g. { cinder-context_is_admin: { key: context_is_admin, value: 'role:admin' } }
|
e.g. { cinder-context_is_admin: { key: context_is_admin, value: 'role:admin' } }
|
||||||
default: {}
|
default: {}
|
||||||
type: json
|
type: json
|
||||||
|
CinderApiWsgiTimeout:
|
||||||
|
default: 60
|
||||||
|
description: The number of seconds until a Cinder API WSGI connection times out.
|
||||||
|
type: number
|
||||||
NotificationDriver:
|
NotificationDriver:
|
||||||
type: string
|
type: string
|
||||||
default: 'noop'
|
default: 'noop'
|
||||||
|
@ -209,13 +213,18 @@ outputs:
|
||||||
"%{hiera('$NETWORK')}"
|
"%{hiera('$NETWORK')}"
|
||||||
params:
|
params:
|
||||||
$NETWORK: {get_param: [ServiceNetMap, CinderApiNetwork]}
|
$NETWORK: {get_param: [ServiceNetMap, CinderApiNetwork]}
|
||||||
-
|
|
||||||
cinder::wsgi::apache::servername:
|
cinder::wsgi::apache::servername:
|
||||||
str_replace:
|
str_replace:
|
||||||
template:
|
template:
|
||||||
"%{hiera('fqdn_$NETWORK')}"
|
"%{hiera('fqdn_$NETWORK')}"
|
||||||
params:
|
params:
|
||||||
$NETWORK: {get_param: [ServiceNetMap, CinderApiNetwork]}
|
$NETWORK: {get_param: [ServiceNetMap, CinderApiNetwork]}
|
||||||
|
cinder::wsgi::apache::vhost_custom_fragment:
|
||||||
|
str_replace:
|
||||||
|
template:
|
||||||
|
"Timeout TIMEOUT"
|
||||||
|
params:
|
||||||
|
TIMEOUT: {get_param: CinderApiWsgiTimeout}
|
||||||
-
|
-
|
||||||
if:
|
if:
|
||||||
- cinder_workers_zero
|
- cinder_workers_zero
|
||||||
|
|
|
@ -102,6 +102,10 @@ parameters:
|
||||||
description: >
|
description: >
|
||||||
Cron to purge db entries marked as deleted and older than $age - Max Delay
|
Cron to purge db entries marked as deleted and older than $age - Max Delay
|
||||||
default: '3600'
|
default: '3600'
|
||||||
|
CinderRpcResponseTimeout:
|
||||||
|
default: 60
|
||||||
|
description: Cinder's RPC response timeout, in seconds.
|
||||||
|
type: number
|
||||||
NovaPassword:
|
NovaPassword:
|
||||||
type: string
|
type: string
|
||||||
description: The password for the nova service and db account
|
description: The password for the nova service and db account
|
||||||
|
@ -144,6 +148,7 @@ outputs:
|
||||||
- {get_param: CinderDebug }
|
- {get_param: CinderDebug }
|
||||||
cinder::storage_availability_zone: {get_param: CinderStorageAvailabilityZone}
|
cinder::storage_availability_zone: {get_param: CinderStorageAvailabilityZone}
|
||||||
cinder::rabbit_heartbeat_timeout_threshold: 60
|
cinder::rabbit_heartbeat_timeout_threshold: 60
|
||||||
|
cinder::rpc_response_timeout: {get_param: CinderRpcResponseTimeout}
|
||||||
cinder::db::database_db_max_retries: -1
|
cinder::db::database_db_max_retries: -1
|
||||||
cinder::db::database_max_retries: -1
|
cinder::db::database_max_retries: -1
|
||||||
cinder::cron::db_purge::minute: {get_param: CinderCronDbPurgeMinute}
|
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