Browse Source

Remove idle_timeout option

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

Change-Id: If6e10f6fb59ea9713ed871aa760d981aeb5719c2
changes/72/714372/1
ZhongShengping 2 years ago
parent
commit
1fcc9a3e2c
  1. 16
      manifests/db.pp
  2. 3
      releasenotes/notes/remove_idle_timeout_option-b5fedb12f38746bd.yaml

16
manifests/db.pp

@ -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 watcher::db (
$database_connection = 'sqlite:////var/lib/watcher/watcher.sqlite',
$database_connection_recycle_time = $::os_service_default,
@ -58,24 +52,16 @@ class watcher::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 watcher::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 { 'watcher_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,

3
releasenotes/notes/remove_idle_timeout_option-b5fedb12f38746bd.yaml

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