openstack/puppet-neutron
Code Issues Proposed changes

Remove idle_timeout option

Browse Source 
The idle_timeout parameter has been deprecated for two releases.
We can remove it.

Change-Id: If31c73dbedf622ddfb51aca53e9c0b42d97c0f72
This commit is contained in:
ZhongShengping 2020-03-23 14:45:48 +08:00 committed by Takashi Kajinami
parent 3489c25a0f
commit 8bc7a0a6ee
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/db.pp
View File

@ -40,10 +40,6 @@
#
# DEPRECATED PARAMETERS
#
# [*database_idle_timeout*]
# Timeout when db connections should be reaped.
# Defaults to undef.
#
# [*database_min_pool_size*]
# Minimum number of SQL connections to keep open in a pool.
# (Optional) Defaults to undef.
@ -58,17 +54,11 @@ class neutron::db (
$database_pool_timeout = $::os_service_default,
$database_db_max_retries = $::os_service_default,
# DEPRECATED PARAMETERS
$database_idle_timeout = undef,
$database_min_pool_size = undef,
) {
include neutron::deps
if $database_idle_timeout {
warning('The database_idle_timeout parameter is deprecated. Please use \
database_connection_recycle_time instead.')
}
if $::neutron::server::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.')
}
@ -76,7 +66,7 @@ database_connection_recycle_time instead.')
# NOTE(spredzy): In order to keep backward compatibility we rely on the pick function
# to use neutron::<myparam> if neutron::db::<myparam> isn't specified.
$database_connection_real = pick($::neutron::server::database_connection, $database_connection)
$database_connection_recycle_time_real = pick($::neutron::server::database_idle_timeout, $database_idle_timeout,
$database_connection_recycle_time_real = pick($::neutron::server::database_idle_timeout,
$database_connection_recycle_time)
$database_max_pool_size_real = pick($::neutron::server::database_max_pool_size, $database_max_pool_size)
$database_max_retries_real = pick($::neutron::server::database_max_retries, $database_max_retries)

3
releasenotes/notes/remove_idle_timeout_option-9fc95800c716b5ee.yaml Normal file
View File

@ -0,0 +1,3 @@
---
upgrade:
- Deprecated idle_timeout option has been removed.