Add pool_timeout option

Add pool_timeout option to configure this value for pool_timeout with
SQLAlchemy.

Change-Id: Ib008dafad590d1afe0df5ab7b478dad40c8cbe1f
Closes-Bug: #1757581
This commit is contained in:
ZhongShengping 2018-03-22 11:09:50 +08:00
parent de4e1b4baf
commit 0321d3522e
3 changed files with 14 additions and 0 deletions

View File

@ -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 keystone::db (
$database_db_max_retries = $::os_service_default,
$database_connection = 'sqlite:////var/lib/keystone/keystone.sqlite',
@ -47,6 +51,7 @@ class keystone::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 ::keystone::deps
@ -73,6 +78,7 @@ class keystone::db (
max_retries => $database_max_retries_real,
retry_interval => $database_retry_interval_real,
max_overflow => $database_max_overflow_real,
pool_timeout => $database_pool_timeout,
}
}

View File

@ -0,0 +1,5 @@
---
features:
- |
Adds the pool_timeout option for configuring oslo.db. This will
configure this value for pool_timeout with SQLAlchemy.

View File

@ -15,6 +15,7 @@ describe 'keystone::db' do
:max_retries => '<SERVICE DEFAULT>',
:retry_interval => '<SERVICE DEFAULT>',
:max_overflow => '<SERVICE DEFAULT>',
:pool_timeout => '<SERVICE DEFAULT>',
)}
end
@ -28,6 +29,7 @@ describe 'keystone::db' do
:database_max_pool_size => '21',
:database_max_retries => '11',
:database_max_overflow => '21',
:database_pool_timeout => '21',
:database_retry_interval => '11', }
end
@ -40,6 +42,7 @@ describe 'keystone::db' do
:max_retries => '11',
:retry_interval => '11',
:max_overflow => '21',
:pool_timeout => '21',
)}
end