Merge "Remove deprecated database_min_pool_size"

This commit is contained in:
Zuul 2022-02-18 09:59:49 +00:00 committed by Gerrit Code Review
commit 446b1cb262
3 changed files with 5 additions and 17 deletions

View File

@ -38,12 +38,6 @@
# Cluster (NDB).
# 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 trove::db (
$database_connection = 'sqlite:////var/lib/trove/trove.sqlite',
$database_connection_recycle_time = $::os_service_default,
@ -53,16 +47,10 @@ class trove::db (
$database_max_overflow = $::os_service_default,
$database_pool_timeout = $::os_service_default,
$mysql_enable_ndb = $::os_service_default,
# DEPRECATED PARAMETERS
$database_min_pool_size = undef,
) {
include trove::deps
if $::trove::database_min_pool_size or $database_min_pool_size {
warning('The database_min_pool_size parameter is deprecated, and will be removed in a future release.')
}
# NOTE(spredzy): In order to keep backward compatibility we rely on the pick function
# to use trove::<myparam> if trove::db::<myparam> isn't specified.
$database_connection_real = pick($::trove::database_connection, $database_connection)

View File

@ -270,10 +270,6 @@
#
# DEPRECATED PARAMETERS
#
# [*database_min_pool_size*]
# (optional) Minimum number of SQL connections to keep open in a pool.
# Defaults to: undef.
#
# [*nova_proxy_admin_user*]
# (optional) Admin username used to connect to nova.
# Defaults to undef
@ -352,7 +348,6 @@ class trove(
$default_neutron_networks = $::os_service_default,
$package_ensure = 'present',
# DEPRECATED PARAMETERS
$database_min_pool_size = undef,
$nova_proxy_admin_user = undef,
$nova_proxy_admin_pass = undef,
$nova_proxy_admin_tenant_name = undef,

View File

@ -0,0 +1,5 @@
---
upgrade:
- |
The ``trove::db::database_min_pool_size`` parameter and
the ``trove::database_min_pool_size`` parameter have been removed.