Remove idle_timeout option

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

Change-Id: I83335788f308da40067d66b2d783d27936896a9b
This commit is contained in:
ZhongShengping 2020-03-23 14:45:49 +08:00
parent 1096645b18
commit 6147d3e431
2 changed files with 4 additions and 15 deletions

View File

@ -42,12 +42,6 @@
# (Optional) If set, use this value for pool_timeout with SQLAlchemy.
# Defaults to $::os_service_default
#
# DEPRECATED PARAMETERS
#
# [*database_idle_timeout*]
# Timeout when db connections should be reaped.
# Defaults to undef.
#
class tacker::db (
$database_db_max_retries = $::os_service_default,
$database_connection = 'sqlite:////var/lib/tacker/tacker.sqlite',
@ -58,25 +52,17 @@ class tacker::db (
$database_retry_interval = $::os_service_default,
$database_max_overflow = $::os_service_default,
$database_pool_timeout = $::os_service_default,
# DEPRECATED PARAMETERS
$database_idle_timeout = undef,
) {
include tacker::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 { 'tacker_config':
db_max_retries => $database_db_max_retries,
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_retries => $database_max_retries,
retry_interval => $database_retry_interval,

View File

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