Browse Source

Merge "Support configuring cinder's RPC and WSGI timeouts" into stable/ussuri

changes/30/785130/1
Zuul 1 week ago
committed by Gerrit Code Review
parent
commit
a9308f5801
3 changed files with 21 additions and 1 deletions
  1. +10
    -1
      deployment/cinder/cinder-api-container-puppet.yaml
  2. +5
    -0
      deployment/cinder/cinder-base.yaml
  3. +6
    -0
      releasenotes/notes/cinder-add-timeout-parameters-54550a6e1c11c0b9.yaml

+ 10
- 1
deployment/cinder/cinder-api-container-puppet.yaml View File

@ -80,6 +80,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'
@ -208,13 +212,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


+ 5
- 0
deployment/cinder/cinder-base.yaml View File

@ -102,6 +102,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
@ -144,6 +148,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}


+ 6
- 0
releasenotes/notes/cinder-add-timeout-parameters-54550a6e1c11c0b9.yaml View File

@ -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…
Cancel
Save