Add pool_timeout option
Add pool_timeout option to configure this value for pool_timeout with SQLAlchemy. Change-Id: Ia72d0e2cc2715745f33e71f0b448d84fcdad8f35 Closes-Bug: #1757581
This commit is contained in:
parent
9e31a4071d
commit
9cc26966c8
|
@ -38,6 +38,10 @@
|
|||
# If set, use this value for max_overflow with sqlalchemy.
|
||||
# (Optional) Defaults to $::os_service_default
|
||||
#
|
||||
# [*database_pool_timeout*]
|
||||
# (Optional) If set, use this value for pool_timeout with SQLAlchemy.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
class cinder::db (
|
||||
$database_db_max_retries = $::os_service_default,
|
||||
$database_connection = 'sqlite:////var/lib/cinder/cinder.sqlite',
|
||||
|
@ -47,6 +51,7 @@ class cinder::db (
|
|||
$database_max_retries = $::os_service_default,
|
||||
$database_retry_interval = $::os_service_default,
|
||||
$database_max_overflow = $::os_service_default,
|
||||
$database_pool_timeout = $::os_service_default,
|
||||
) {
|
||||
|
||||
include ::cinder::deps
|
||||
|
@ -73,5 +78,6 @@ class cinder::db (
|
|||
max_retries => $database_max_retries_real,
|
||||
retry_interval => $database_retry_interval_real,
|
||||
max_overflow => $database_max_overflow_real,
|
||||
pool_timeout => $database_pool_timeout,
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
features:
|
||||
- |
|
||||
Adds the pool_timeout option for configuring oslo.db. This will
|
||||
configure this value for pool_timeout with SQLAlchemy.
|
|
@ -15,6 +15,7 @@ describe 'cinder::db' do
|
|||
:max_retries => '<SERVICE DEFAULT>',
|
||||
:retry_interval => '<SERVICE DEFAULT>',
|
||||
:max_overflow => '<SERVICE DEFAULT>',
|
||||
:pool_timeout => '<SERVICE DEFAULT>',
|
||||
)}
|
||||
|
||||
end
|
||||
|
@ -28,7 +29,8 @@ describe 'cinder::db' do
|
|||
:database_max_pool_size => '11',
|
||||
:database_max_retries => '11',
|
||||
:database_retry_interval => '11',
|
||||
:database_max_overflow => '21', }
|
||||
:database_max_overflow => '21',
|
||||
:database_pool_timeout => '21', }
|
||||
end
|
||||
|
||||
it { is_expected.to contain_oslo__db('cinder_config').with(
|
||||
|
@ -40,6 +42,7 @@ describe 'cinder::db' do
|
|||
:max_retries => '11',
|
||||
:retry_interval => '11',
|
||||
:max_overflow => '21',
|
||||
:pool_timeout => '21',
|
||||
)}
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue