Remove idle_timeout option

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

Change-Id: I3621386d22885ecbcb1b1ea4d0afdae46b9cd162
This commit is contained in:
ZhongShengping 2020-03-23 14:45:48 +08:00
parent cb67cd471a
commit 24fd4179c3
2 changed files with 4 additions and 15 deletions

View File

@ -42,12 +42,6 @@
# before error is raised. Set to -1 to specify an infinite retry count.
# Defaults to $::os_service_default
#
# DEPRECATED PARAMETERS
#
# [*database_idle_timeout*]
# Timeout when db connections should be reaped.
# Defaults to undef.
#
class magnum::db (
$database_connection = 'mysql+pymysql://magnum:magnum@localhost:3306/magnum',
$database_connection_recycle_time = $::os_service_default,
@ -58,24 +52,16 @@ class magnum::db (
$database_max_overflow = $::os_service_default,
$database_pool_timeout = $::os_service_default,
$database_db_max_retries = $::os_service_default,
# DEPRECATED PARAMETERS
$database_idle_timeout = undef,
) {
include magnum::deps
if $database_idle_timeout {
warning('The database_idle_timeout parameter is deprecated. Please use \
database_connection_recycle_time instead.')
}
$database_connection_recycle_time_real = pick($database_idle_timeout, $database_connection_recycle_time)
validate_legacy(Oslo::Dbconn, 'validate_re', $database_connection,
['^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?'])
oslo::db { 'magnum_config':
connection => $database_connection,
connection_recycle_time => $database_connection_recycle_time_real,
connection_recycle_time => $database_connection_recycle_time,
min_pool_size => $database_min_pool_size,
max_pool_size => $database_max_pool_size,
max_retries => $database_max_retries,

View File

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