Deprecate min_pool_size option
min_pool_size option is not used,see: https://review.opendev.org/#/c/565090/ Change-Id: I89aaa943c7af18298fce74e38a60639b8bd15068 Closes-Bug: #1868511
This commit is contained in:
parent
8ffd2a765b
commit
a82d3e4572
|
@ -23,11 +23,6 @@
|
||||||
# NOTE: This is currently NOT used until barbican correctly leverages oslo.
|
# NOTE: This is currently NOT used until barbican correctly leverages oslo.
|
||||||
# (Optional) Defaults to $::os_service_default
|
# (Optional) Defaults to $::os_service_default
|
||||||
#
|
#
|
||||||
# [*database_min_pool_size*]
|
|
||||||
# Minimum number of SQL connections to keep open in a pool.
|
|
||||||
# NOTE: This is currently NOT used until barbican correctly leverages oslo.
|
|
||||||
# (Optional) Defaults to $::os_service_default
|
|
||||||
#
|
|
||||||
# [*database_max_pool_size*]
|
# [*database_max_pool_size*]
|
||||||
# Maximum number of SQL connections to keep open in a pool.
|
# Maximum number of SQL connections to keep open in a pool.
|
||||||
# NOTE: This is currently NOT used until barbican correctly leverages oslo.
|
# NOTE: This is currently NOT used until barbican correctly leverages oslo.
|
||||||
|
@ -52,10 +47,16 @@
|
||||||
# (Optional) If set, use this value for pool_timeout with SQLAlchemy.
|
# (Optional) If set, use this value for pool_timeout with SQLAlchemy.
|
||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
#
|
#
|
||||||
|
# DEPRECATED PARAMETERS
|
||||||
|
#
|
||||||
|
# [*database_min_pool_size*]
|
||||||
|
# Minimum number of SQL connections to keep open in a pool.
|
||||||
|
# NOTE: This is currently NOT used until barbican correctly leverages oslo.
|
||||||
|
# (Optional) Defaults to undef
|
||||||
|
#
|
||||||
class barbican::db (
|
class barbican::db (
|
||||||
$database_connection = 'sqlite:////var/lib/barbican/barbican.sqlite',
|
$database_connection = 'sqlite:////var/lib/barbican/barbican.sqlite',
|
||||||
$database_connection_recycle_time = $::os_service_default,
|
$database_connection_recycle_time = $::os_service_default,
|
||||||
$database_min_pool_size = $::os_service_default,
|
|
||||||
$database_max_pool_size = $::os_service_default,
|
$database_max_pool_size = $::os_service_default,
|
||||||
$database_max_retries = $::os_service_default,
|
$database_max_retries = $::os_service_default,
|
||||||
$database_retry_interval = $::os_service_default,
|
$database_retry_interval = $::os_service_default,
|
||||||
|
@ -63,17 +64,22 @@ class barbican::db (
|
||||||
$database_pool_size = $::os_service_default,
|
$database_pool_size = $::os_service_default,
|
||||||
$database_db_max_retries = $::os_service_default,
|
$database_db_max_retries = $::os_service_default,
|
||||||
$database_pool_timeout = $::os_service_default,
|
$database_pool_timeout = $::os_service_default,
|
||||||
|
# DEPRECATED PARAMETERS
|
||||||
|
$database_min_pool_size = undef,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include barbican::deps
|
include barbican::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,
|
validate_legacy(Oslo::Dbconn, 'validate_re', $database_connection,
|
||||||
['^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?'])
|
['^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?'])
|
||||||
|
|
||||||
oslo::db { 'barbican_config':
|
oslo::db { 'barbican_config':
|
||||||
connection => $database_connection,
|
connection => $database_connection,
|
||||||
connection_recycle_time => $database_connection_recycle_time,
|
connection_recycle_time => $database_connection_recycle_time,
|
||||||
min_pool_size => $database_min_pool_size,
|
|
||||||
max_pool_size => $database_max_pool_size,
|
max_pool_size => $database_max_pool_size,
|
||||||
max_retries => $database_max_retries,
|
max_retries => $database_max_retries,
|
||||||
retry_interval => $database_retry_interval,
|
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.
|
|
@ -28,7 +28,6 @@ describe 'barbican::db' do
|
||||||
:db_max_retries => '<SERVICE DEFAULT>',
|
:db_max_retries => '<SERVICE DEFAULT>',
|
||||||
:connection => 'sqlite:////var/lib/barbican/barbican.sqlite',
|
:connection => 'sqlite:////var/lib/barbican/barbican.sqlite',
|
||||||
:connection_recycle_time => '<SERVICE DEFAULT>',
|
:connection_recycle_time => '<SERVICE DEFAULT>',
|
||||||
:min_pool_size => '<SERVICE DEFAULT>',
|
|
||||||
:max_pool_size => '<SERVICE DEFAULT>',
|
:max_pool_size => '<SERVICE DEFAULT>',
|
||||||
:max_retries => '<SERVICE DEFAULT>',
|
:max_retries => '<SERVICE DEFAULT>',
|
||||||
:retry_interval => '<SERVICE DEFAULT>',
|
:retry_interval => '<SERVICE DEFAULT>',
|
||||||
|
@ -48,7 +47,6 @@ describe 'barbican::db' do
|
||||||
{
|
{
|
||||||
:database_connection => 'mysql+pymysql://barbican:barbican@localhost/barbican',
|
:database_connection => 'mysql+pymysql://barbican:barbican@localhost/barbican',
|
||||||
:database_connection_recycle_time => '3601',
|
:database_connection_recycle_time => '3601',
|
||||||
:database_min_pool_size => '2',
|
|
||||||
:database_max_pool_size => '11',
|
:database_max_pool_size => '11',
|
||||||
:database_max_retries => '11',
|
:database_max_retries => '11',
|
||||||
:database_retry_interval => '11',
|
:database_retry_interval => '11',
|
||||||
|
@ -65,7 +63,6 @@ describe 'barbican::db' do
|
||||||
:db_max_retries => '-1',
|
:db_max_retries => '-1',
|
||||||
:connection => 'mysql+pymysql://barbican:barbican@localhost/barbican',
|
:connection => 'mysql+pymysql://barbican:barbican@localhost/barbican',
|
||||||
:connection_recycle_time => '3601',
|
:connection_recycle_time => '3601',
|
||||||
:min_pool_size => '2',
|
|
||||||
:max_pool_size => '11',
|
:max_pool_size => '11',
|
||||||
:max_retries => '11',
|
:max_retries => '11',
|
||||||
:retry_interval => '11',
|
:retry_interval => '11',
|
||||||
|
|
Loading…
Reference in New Issue