Deprecate database options from the octavia class
... because these options have been implemented in the octavia::db class. Change-Id: Idbd47c051cf48b35a346fea06866ab90b6fb325c
This commit is contained in:
parent
27f55fc468
commit
d251519d6b
|
@ -184,6 +184,12 @@
|
|||
# in the octavia config.
|
||||
# Defaults to false.
|
||||
#
|
||||
# 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.
|
||||
|
@ -218,12 +224,6 @@
|
|||
# before error is raised. Set to -1 to specify an infinite retry count.
|
||||
# Defaults to undef.
|
||||
#
|
||||
# DEPRECATED PARAMETERS
|
||||
#
|
||||
# [*database_min_pool_size*]
|
||||
# (Optional) Minimum number of SQL connections to keep open in a pool.
|
||||
# Defaults to undef.
|
||||
#
|
||||
class octavia (
|
||||
$package_ensure = 'present',
|
||||
$default_transport_url = $::os_service_default,
|
||||
|
@ -263,6 +263,8 @@ class octavia (
|
|||
$notification_topics = $::os_service_default,
|
||||
$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,
|
||||
|
@ -271,13 +273,52 @@ class octavia (
|
|||
$database_max_overflow = undef,
|
||||
$database_pool_timeout = undef,
|
||||
$database_db_max_retries = undef,
|
||||
# DEPRECATED PARAMETERS
|
||||
$database_min_pool_size = undef,
|
||||
) inherits octavia::params {
|
||||
|
||||
include octavia::deps
|
||||
include octavia::db
|
||||
|
||||
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,14 @@
|
|||
---
|
||||
deprecations:
|
||||
- |
|
||||
The following options have been deprecated, as those options have been
|
||||
moved to octavia::db class.
|
||||
|
||||
- ``octavia::database_connection``
|
||||
- ``octavia::database_idle_timeout``
|
||||
- ``octavia::database_max_overflow``
|
||||
- ``octavia::database_max_pool_size``
|
||||
- ``octavia::database_max_retries``
|
||||
- ``octavia::database_retry_interval``
|
||||
- ``octavia::database_pool_timeout``
|
||||
- ``octavia::database_db_max_retries``
|
Loading…
Reference in New Issue