openstack/puppet-keystone
Code Issues Proposed changes

Remove deprecated database_min_pool_size parameter

Browse Source 
Change-Id: Ia1208fc902064ce5cf3dc769e72cade497142e68
This commit is contained in:
Tobias Urdin 2020-08-18 09:23:56 +02:00
parent ee755ad4ed
commit 35f5e5e520
3 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/db.pp
View File

@ -38,12 +38,6 @@
# (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.
# (Optional) Defaults to undef
#
class keystone::db ( class keystone::db (
$database_db_max_retries = $::os_service_default, $database_db_max_retries = $::os_service_default,
$database_connection = 'sqlite:////var/lib/keystone/keystone.sqlite', $database_connection = 'sqlite:////var/lib/keystone/keystone.sqlite',
@ -53,16 +47,10 @@ class keystone::db (
$database_retry_interval = $::os_service_default, $database_retry_interval = $::os_service_default,
$database_max_overflow = $::os_service_default, $database_max_overflow = $::os_service_default,
$database_pool_timeout = $::os_service_default, $database_pool_timeout = $::os_service_default,
# DEPRECATED PARAMETERS
$database_min_pool_size = undef,
) { ) {
include keystone::deps include keystone::deps
if $::keystone::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 # NOTE(spredzy): In order to keep backward compatibility we rely on the pick function
# to use keystone::<myparam> if keystone::db::<myparam> isn't specified. # to use keystone::<myparam> if keystone::db::<myparam> isn't specified.
$database_connection_real = pick($::keystone::database_connection, $database_connection) $database_connection_real = pick($::keystone::database_connection, $database_connection)

5
manifests/init.pp
View File

@ -433,10 +433,6 @@
# (Optional) Driver to use for managing tokens. # (Optional) Driver to use for managing tokens.
# Defaults to undef # Defaults to undef
# #
# [*database_min_pool_size*]
# (Optional) Minimum number of SQL connections to keep open in a pool.
# Defaults to: undef
#
# == Authors # == Authors
# #
# Dan Bode dan@puppetlabs.com # Dan Bode dan@puppetlabs.com
@ -526,7 +522,6 @@ class keystone(
$admin_workers = undef, $admin_workers = undef,
$public_workers = undef, $public_workers = undef,
$token_driver = undef, $token_driver = undef,
$database_min_pool_size = undef,
) inherits keystone::params { ) inherits keystone::params {
include keystone::deps include keystone::deps

5
releasenotes/notes/remove-deprecated-database-min-pool-size-85d9e856d15b6b15.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
The deprecated parameter database_min_pool_size is removed in the keystone
init class and keystone::db class.