Merge "Remove deprecated database_min_pool_size"
This commit is contained in:
commit
39c65edecb
|
@ -43,12 +43,6 @@
|
||||||
# Cluster (NDB).
|
# Cluster (NDB).
|
||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
#
|
#
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
#
|
|
||||||
# [*database_min_pool_size*]
|
|
||||||
# Minimum number of SQL connections to keep open in a pool.
|
|
||||||
# (Optional) Defaults to undef
|
|
||||||
#
|
|
||||||
class ec2api::db (
|
class ec2api::db (
|
||||||
$database_connection = 'sqlite:////var/lib/ec2api/ec2api.sqlite',
|
$database_connection = 'sqlite:////var/lib/ec2api/ec2api.sqlite',
|
||||||
$database_connection_recycle_time = $::os_service_default,
|
$database_connection_recycle_time = $::os_service_default,
|
||||||
|
@ -59,16 +53,10 @@ class ec2api::db (
|
||||||
$database_max_overflow = $::os_service_default,
|
$database_max_overflow = $::os_service_default,
|
||||||
$database_pool_timeout = $::os_service_default,
|
$database_pool_timeout = $::os_service_default,
|
||||||
$mysql_enable_ndb = $::os_service_default,
|
$mysql_enable_ndb = $::os_service_default,
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
$database_min_pool_size = undef,
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ec2api::deps
|
include ec2api::deps
|
||||||
|
|
||||||
if $database_min_pool_size {
|
|
||||||
warning('The database_min_pool_size parameter is deprecated, and will be removed in a future release.')
|
|
||||||
}
|
|
||||||
|
|
||||||
oslo::db { 'ec2api_config':
|
oslo::db { 'ec2api_config':
|
||||||
connection => $database_connection,
|
connection => $database_connection,
|
||||||
connection_recycle_time => $database_connection_recycle_time,
|
connection_recycle_time => $database_connection_recycle_time,
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The ``ec2api::db::database_min_pool_size`` parameter has been removed.
|
Loading…
Reference in New Issue