Deprecate min_pool_size option
min_pool_size option is not used,see: https://review.opendev.org/#/c/565090/ Change-Id: I6f0591f44cfb1ad2f5eb3322c119cd0345b782f6 Closes-Bug: #1868511
This commit is contained in:
parent
14ebaa52f2
commit
57f76bd65b
|
@ -26,10 +26,6 @@
|
|||
# Interval between retries of opening a database connection.
|
||||
# (Optional) Defaults to $::os_service_default
|
||||
#
|
||||
# [*database_min_pool_size*]
|
||||
# Minimum number of SQL connections to keep open in a pool.
|
||||
# (Optional) Defaults to $::os_service_default
|
||||
#
|
||||
# [*database_max_pool_size*]
|
||||
# Maximum number of SQL connections to keep open in a pool.
|
||||
# (Optional) Defaults to $::os_service_default
|
||||
|
@ -42,27 +38,37 @@
|
|||
# (Optional) If set, use this value for pool_timeout with SQLAlchemy.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# DEPRECATED PARAMETERS
|
||||
#
|
||||
# [*database_min_pool_size*]
|
||||
# Minimum number of SQL connections to keep open in a pool.
|
||||
# (Optional) Defaults to undef
|
||||
#
|
||||
class ec2api::db (
|
||||
$database_connection = 'sqlite:////var/lib/ec2api/ec2api.sqlite',
|
||||
$database_connection_recycle_time = $::os_service_default,
|
||||
$database_min_pool_size = $::os_service_default,
|
||||
$database_max_pool_size = $::os_service_default,
|
||||
$database_db_max_retries = $::os_service_default,
|
||||
$database_max_retries = $::os_service_default,
|
||||
$database_retry_interval = $::os_service_default,
|
||||
$database_max_overflow = $::os_service_default,
|
||||
$database_pool_timeout = $::os_service_default,
|
||||
# DEPRECATED PARAMETERS
|
||||
$database_min_pool_size = undef,
|
||||
) {
|
||||
|
||||
include ec2api::deps
|
||||
|
||||
if $database_min_pool_size {
|
||||
warning('The database_min_pool_size parameter is deprecated, and will be removed in a future release.')
|
||||
}
|
||||
|
||||
validate_legacy(Oslo::Dbconn, 'validate_re', $database_connection,
|
||||
['^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?'])
|
||||
|
||||
oslo::db { 'ec2api_config':
|
||||
connection => $database_connection,
|
||||
connection_recycle_time => $database_connection_recycle_time,
|
||||
min_pool_size => $database_min_pool_size,
|
||||
db_max_retries => $database_db_max_retries,
|
||||
max_retries => $database_max_retries,
|
||||
retry_interval => $database_retry_interval,
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
deprecations:
|
||||
- database_min_pool_size option is now deprecated for removal, the
|
||||
parameter has no effect.
|
|
@ -8,7 +8,6 @@ describe 'ec2api::db' do
|
|||
it { should contain_oslo__db('ec2api_config').with(
|
||||
:connection => 'sqlite:////var/lib/ec2api/ec2api.sqlite',
|
||||
:connection_recycle_time => '<SERVICE DEFAULT>',
|
||||
:min_pool_size => '<SERVICE DEFAULT>',
|
||||
:db_max_retries => '<SERVICE DEFAULT>',
|
||||
:max_retries => '<SERVICE DEFAULT>',
|
||||
:retry_interval => '<SERVICE DEFAULT>',
|
||||
|
@ -23,7 +22,6 @@ describe 'ec2api::db' do
|
|||
{
|
||||
:database_connection => 'sqlite:////path/to/my/db.sqlite',
|
||||
:database_connection_recycle_time => '1',
|
||||
:database_min_pool_size => '2',
|
||||
:database_db_max_retries => '-1',
|
||||
:database_max_retries => '3',
|
||||
:database_retry_interval => '4',
|
||||
|
@ -38,7 +36,6 @@ describe 'ec2api::db' do
|
|||
it { should contain_oslo__db('ec2api_config').with(
|
||||
:connection => 'sqlite:////path/to/my/db.sqlite',
|
||||
:connection_recycle_time => '1',
|
||||
:min_pool_size => '2',
|
||||
:db_max_retries => '-1',
|
||||
:max_retries => '3',
|
||||
:retry_interval => '4',
|
||||
|
|
Loading…
Reference in New Issue