Remove idle_timeout option
The idle_timeout parameter has been deprecated for two releases. We can remove it. Change-Id: I8dd3443d02949c4001b8f7f7e8a9e9c9ad5a5062
This commit is contained in:
parent
06a1272b25
commit
cc2bf1b6b7
|
@ -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 freezer::db (
|
||||
$database_connection = 'sqlite:////var/lib/freezer/freezer.sqlite',
|
||||
$database_connection_recycle_time = $::os_service_default,
|
||||
|
@ -58,8 +52,6 @@ class freezer::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 freezer::deps
|
||||
|
@ -67,15 +59,9 @@ class freezer::db (
|
|||
validate_legacy(Oslo::Dbconn, 'validate_re', $database_connection,
|
||||
['^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?'])
|
||||
|
||||
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)
|
||||
|
||||
oslo::db { 'freezer_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,
|
||||
db_max_retries => $database_db_max_retries,
|
||||
max_retries => $database_max_retries,
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
---
|
||||
upgrade:
|
||||
- Deprecated idle_timeout option has been removed.
|
Loading…
Reference in New Issue