Remove idle_timeout option
The idle_timeout parameter has been deprecated for two releases. We can remove it. Change-Id: Iaed980290c707463652c36928ec24f603301a183
This commit is contained in:
parent
1e628f8840
commit
16d279e21e
|
@ -42,12 +42,6 @@
|
||||||
# (Optional) If set, use this value for pool_timeout with SQLAlchemy.
|
# (Optional) If set, use this value for pool_timeout with SQLAlchemy.
|
||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
#
|
#
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
#
|
|
||||||
# [*database_idle_timeout*]
|
|
||||||
# Timeout when db connections should be reaped.
|
|
||||||
# Defaults to undef.
|
|
||||||
#
|
|
||||||
class glance::api::db (
|
class glance::api::db (
|
||||||
$database_db_max_retries = $::os_service_default,
|
$database_db_max_retries = $::os_service_default,
|
||||||
$database_connection = 'sqlite:///var/lib/glance/glance.sqlite',
|
$database_connection = 'sqlite:///var/lib/glance/glance.sqlite',
|
||||||
|
@ -58,21 +52,14 @@ class glance::api::db (
|
||||||
$database_retry_interval = $::os_service_default,
|
$database_retry_interval = $::os_service_default,
|
||||||
$database_max_overflow = $::os_service_default,
|
$database_max_overflow = $::os_service_default,
|
||||||
$database_pool_timeout = $::os_service_default,
|
$database_pool_timeout = $::os_service_default,
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
$database_idle_timeout = undef,
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include glance::deps
|
include glance::deps
|
||||||
|
|
||||||
if $database_idle_timeout {
|
|
||||||
warning('The database_idle_timeout parameter is deprecated. Please use \
|
|
||||||
database_connection_recycle_time instead.')
|
|
||||||
}
|
|
||||||
|
|
||||||
# NOTE(degorenko): In order to keep backward compatibility we rely on the pick function
|
# NOTE(degorenko): In order to keep backward compatibility we rely on the pick function
|
||||||
# to use glance::api::<myparam> if glance::api::db::<myparam> isn't specified.
|
# to use glance::api::<myparam> if glance::api::db::<myparam> isn't specified.
|
||||||
$database_connection_real = pick($::glance::api::database_connection, $database_connection)
|
$database_connection_real = pick($::glance::api::database_connection, $database_connection)
|
||||||
$database_connection_recycle_time_real = pick($::glance::api::database_idle_timeout, $database_idle_timeout,
|
$database_connection_recycle_time_real = pick($::glance::api::database_idle_timeout,
|
||||||
$database_connection_recycle_time)
|
$database_connection_recycle_time)
|
||||||
$database_min_pool_size_real = pick($::glance::api::database_min_pool_size, $database_min_pool_size)
|
$database_min_pool_size_real = pick($::glance::api::database_min_pool_size, $database_min_pool_size)
|
||||||
$database_max_pool_size_real = pick($::glance::api::database_max_pool_size, $database_max_pool_size)
|
$database_max_pool_size_real = pick($::glance::api::database_max_pool_size, $database_max_pool_size)
|
||||||
|
|
|
@ -42,12 +42,6 @@
|
||||||
# (Optional) If set, use this value for pool_timeout with SQLAlchemy.
|
# (Optional) If set, use this value for pool_timeout with SQLAlchemy.
|
||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
#
|
#
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
#
|
|
||||||
# [*database_idle_timeout*]
|
|
||||||
# Timeout when db connections should be reaped.
|
|
||||||
# Defaults to undef.
|
|
||||||
#
|
|
||||||
class glance::registry::db (
|
class glance::registry::db (
|
||||||
$database_db_max_retries = $::os_service_default,
|
$database_db_max_retries = $::os_service_default,
|
||||||
$database_connection = 'sqlite:///var/lib/glance/glance.sqlite',
|
$database_connection = 'sqlite:///var/lib/glance/glance.sqlite',
|
||||||
|
@ -58,21 +52,14 @@ class glance::registry::db (
|
||||||
$database_retry_interval = $::os_service_default,
|
$database_retry_interval = $::os_service_default,
|
||||||
$database_max_overflow = $::os_service_default,
|
$database_max_overflow = $::os_service_default,
|
||||||
$database_pool_timeout = $::os_service_default,
|
$database_pool_timeout = $::os_service_default,
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
$database_idle_timeout = undef,
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include glance::deps
|
include glance::deps
|
||||||
|
|
||||||
if $database_idle_timeout {
|
|
||||||
warning('The database_idle_timeout parameter is deprecated. Please use \
|
|
||||||
database_connection_recycle_time instead.')
|
|
||||||
}
|
|
||||||
|
|
||||||
# NOTE(degorenko): In order to keep backward compatibility we rely on the pick function
|
# NOTE(degorenko): In order to keep backward compatibility we rely on the pick function
|
||||||
# to use glance::registry::<myparam> if glance::registry::db::<myparam> isn't specified.
|
# to use glance::registry::<myparam> if glance::registry::db::<myparam> isn't specified.
|
||||||
$database_connection_real = pick($::glance::registry::database_connection, $database_connection)
|
$database_connection_real = pick($::glance::registry::database_connection, $database_connection)
|
||||||
$database_connection_recycle_time_real = pick($::glance::registry::database_idle_timeout, $database_idle_timeout,
|
$database_connection_recycle_time_real = pick($::glance::registry::database_idle_timeout,
|
||||||
$database_connection_recycle_time)
|
$database_connection_recycle_time)
|
||||||
$database_min_pool_size_real = pick($::glance::registry::database_min_pool_size, $database_min_pool_size)
|
$database_min_pool_size_real = pick($::glance::registry::database_min_pool_size, $database_min_pool_size)
|
||||||
$database_max_pool_size_real = pick($::glance::registry::database_max_pool_size, $database_max_pool_size)
|
$database_max_pool_size_real = pick($::glance::registry::database_max_pool_size, $database_max_pool_size)
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- Deprecated idle_timeout option has been removed.
|
Loading…
Reference in New Issue