Clean up deprecated database parameters
Change-Id: If2d0dce800e767f7341b718a44af0edb97e26946
This commit is contained in:
Takashi Kajinami
parent
be9130696f
commit
f3646c1755
@ -43,12 +43,6 @@
|
||||
# before error is raised. Set to -1 to specify an infinite retry count.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# DEPRECATED PARAMETERS
|
||||
#
|
||||
# [*database_min_pool_size*]
|
||||
# (Optional) Minimum number of SQL connections to keep open in a pool.
|
||||
# Defaults to undef
|
||||
#
|
||||
class octavia::db (
|
||||
$database_connection = 'sqlite:////var/lib/octavia/octavia.sqlite',
|
||||
$database_connection_recycle_time = $::os_service_default,
|
||||
@ -59,36 +53,20 @@ class octavia::db (
|
||||
$database_pool_timeout = $::os_service_default,
|
||||
$mysql_enable_ndb = $::os_service_default,
|
||||
$database_db_max_retries = $::os_service_default,
|
||||
# DEPRECATED PARAMETERS
|
||||
$database_min_pool_size = undef,
|
||||
) {
|
||||
|
||||
include octavia::deps
|
||||
|
||||
if $::octavia::database_min_pool_size or $database_min_pool_size {
|
||||
warning('The database_min_pool_size parameter is deprecated, and will be removed in a future release.')
|
||||
}
|
||||
|
||||
$database_connection_real = pick($::octavia::database_connection, $database_connection)
|
||||
$database_connection_recycle_time_real = pick($::octavia::database_idle_timeout,
|
||||
$database_connection_recycle_time)
|
||||
$database_max_pool_size_real = pick($::octavia::database_max_pool_size, $database_max_pool_size)
|
||||
$database_max_retries_real = pick($::octavia::database_max_retries, $database_max_retries)
|
||||
$database_retry_interval_real = pick($::octavia::database_retry_interval, $database_retry_interval)
|
||||
$database_max_overflow_real = pick($::octavia::database_max_overflow, $database_max_overflow)
|
||||
$database_pool_timeout_real = pick($::octavia::database_pool_timeout, $database_pool_timeout)
|
||||
$database_db_max_retries_real = pick($::octavia::database_db_max_retries, $database_db_max_retries)
|
||||
|
||||
oslo::db { 'octavia_config':
|
||||
connection => $database_connection_real,
|
||||
connection_recycle_time => $database_connection_recycle_time_real,
|
||||
max_pool_size => $database_max_pool_size_real,
|
||||
max_retries => $database_max_retries_real,
|
||||
retry_interval => $database_retry_interval_real,
|
||||
max_overflow => $database_max_overflow_real,
|
||||
pool_timeout => $database_pool_timeout_real,
|
||||
connection => $database_connection,
|
||||
connection_recycle_time => $database_connection_recycle_time,
|
||||
max_pool_size => $database_max_pool_size,
|
||||
max_retries => $database_max_retries,
|
||||
retry_interval => $database_retry_interval,
|
||||
max_overflow => $database_max_overflow,
|
||||
pool_timeout => $database_pool_timeout,
|
||||
mysql_enable_ndb => $mysql_enable_ndb,
|
||||
db_max_retries => $database_db_max_retries_real,
|
||||
db_max_retries => $database_db_max_retries,
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -182,44 +182,6 @@
|
||||
#
|
||||
# DEPRECATED PARAMETERS
|
||||
#
|
||||
# [*database_min_pool_size*]
|
||||
# (Optional) Minimum number of SQL connections to keep open in a pool.
|
||||
# Defaults to undef.
|
||||
#
|
||||
# [*database_connection*]
|
||||
# (Optional) Url used to connect to database.
|
||||
# Defaults to undef.
|
||||
#
|
||||
# [*database_idle_timeout*]
|
||||
# (Optional) Timeout when db connections should be reaped.
|
||||
# Defaults to undef.
|
||||
#
|
||||
# [*database_max_retries*]
|
||||
# (Optional) Maximum number of database connection retries during startup.
|
||||
# Setting -1 implies an infinite retry count.
|
||||
# Defaults to undef.
|
||||
#
|
||||
# [*database_retry_interval*]
|
||||
# (Optional) Interval between retries of opening a database connection.
|
||||
# Defaults to undef.
|
||||
#
|
||||
# [*database_max_pool_size*]
|
||||
# (Optional) Maximum number of SQL connections to keep open in a pool.
|
||||
# Defaults to undef.
|
||||
#
|
||||
# [*database_max_overflow*]
|
||||
# (Optional) If set, use this value for max_overflow with sqlalchemy.
|
||||
# Defaults to undef.
|
||||
#
|
||||
# [*database_pool_timeout*]
|
||||
# (Optional) If set, use this value for pool_timeout with SQLAlchemy.
|
||||
# Defaults to undef.
|
||||
#
|
||||
# [*database_db_max_retries*]
|
||||
# (Optional) Maximum retries in case of connection error or deadlock error
|
||||
# before error is raised. Set to -1 to specify an infinite retry count.
|
||||
# Defaults to undef.
|
||||
#
|
||||
# [*amqp_allow_insecure_clients*]
|
||||
# (Optional) Accept clients using either SSL or plain TCP
|
||||
# Defaults to undef.
|
||||
@ -263,15 +225,6 @@ class octavia (
|
||||
$topic = 'octavia-rpc',
|
||||
$purge_config = false,
|
||||
# DEPRECATED PARAMETERS
|
||||
$database_min_pool_size = undef,
|
||||
$database_connection = undef,
|
||||
$database_idle_timeout = undef,
|
||||
$database_max_pool_size = undef,
|
||||
$database_max_retries = undef,
|
||||
$database_retry_interval = undef,
|
||||
$database_max_overflow = undef,
|
||||
$database_pool_timeout = undef,
|
||||
$database_db_max_retries = undef,
|
||||
$amqp_allow_insecure_clients = undef,
|
||||
) inherits octavia::params {
|
||||
|
||||
@ -283,47 +236,6 @@ class octavia (
|
||||
will be removed in a future release.')
|
||||
}
|
||||
|
||||
if $database_connection != undef {
|
||||
warning('The database_connection parameter is deprecated and will be \
|
||||
removed in a future realse. Use octavia::db::database_connection instead')
|
||||
}
|
||||
|
||||
if $database_idle_timeout != undef {
|
||||
warning('The database_idle_timeout parameter is deprecated and will be \
|
||||
removed in a future realse. Use octavia::db::database_connection_recycle_time \
|
||||
instead')
|
||||
}
|
||||
|
||||
if $database_max_pool_size != undef {
|
||||
warning('The database_max_pool_size parameter is deprecated and will be \
|
||||
removed in a future realse. Use octavia::db::database_max_pool_size instead')
|
||||
}
|
||||
|
||||
if $database_max_retries!= undef {
|
||||
warning('The database_max_retries parameter is deprecated and will be \
|
||||
removed in a future realse. Use octavia::db::database_max_retries instead')
|
||||
}
|
||||
|
||||
if $database_retry_interval != undef {
|
||||
warning('The database_retry_interval parameter is deprecated and will be \
|
||||
removed in a future realse. Use octavia::db::database_retry_interval instead')
|
||||
}
|
||||
|
||||
if $database_pool_timeout != undef {
|
||||
warning('The database_pool_timeout parameter is deprecated and will be \
|
||||
removed in a future realse. Use octavia::db::database_pool_timeout instead')
|
||||
}
|
||||
|
||||
if $database_max_overflow != undef {
|
||||
warning('The database_max_overflow parameter is deprecated and will be \
|
||||
removed in a future realse. Use octavia::db::database_max_overflow instead')
|
||||
}
|
||||
|
||||
if $database_db_max_retries!= undef {
|
||||
warning('The database_db_max_retries parameter is deprecated and will be \
|
||||
removed in a future realse. Use octavia::db::database_db_max_retries instead')
|
||||
}
|
||||
|
||||
package { 'octavia':
|
||||
ensure => $package_ensure,
|
||||
name => $::octavia::params::common_package_name,
|
||||
|
||||
@ -0,0 +1,18 @@
|
||||
---
|
||||
upgrade:
|
||||
- |
|
||||
The following parameters of the ``octavia`` class has been removed.
|
||||
|
||||
- ``database_min_pool_size``
|
||||
- ``database_connection``
|
||||
- ``database_db_max_retries``
|
||||
- ``database_idle_timeout``
|
||||
- ``database_max_overflow``
|
||||
- ``database_max_pool_size``
|
||||
- ``database_max_retries``
|
||||
- ``database_pool_timeout``
|
||||
- ``database_retry_interval``
|
||||
|
||||
- |
|
||||
The ``database_min_pool_size`` parameter of the ``octavia::db`` class has
|
||||
been removed.
|
||||
Loading…
Reference in New Issue
Block a user