openstack/puppet-keystone
Code Issues Proposed changes

Clean up deprecated database parameters

Browse Source 
Change-Id: I1bacb6a08fe7e04732a870aa46512c21c298f328
This commit is contained in:
Takashi Kajinami 2022-02-07 16:27:22 +09:00
parent 873589a11b
commit 845eb1c9a1
3 changed files with 17 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
manifests/db.pp
View File

@ -57,24 +57,14 @@ class keystone::db (
include keystone::deps
# NOTE(spredzy): In order to keep backward compatibility we rely on the pick function
# to use keystone::<myparam> if keystone::db::<myparam> isn't specified.
$database_connection_real = pick($::keystone::database_connection, $database_connection)
$database_connection_recycle_time_real = pick($::keystone::database_idle_timeout,
$database_connection_recycle_time)
$database_max_pool_size_real = pick($::keystone::database_max_pool_size, $database_max_pool_size)
$database_max_retries_real = pick($::keystone::database_max_retries, $database_max_retries)
$database_retry_interval_real = pick($::keystone::database_retry_interval, $database_retry_interval)
$database_max_overflow_real = pick($::keystone::database_max_overflow, $database_max_overflow)
oslo::db { 'keystone_config':
db_max_retries => $database_db_max_retries,
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,
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,
}

62
manifests/init.pp
View File

@ -354,31 +354,6 @@
#
# DEPRECATED PARAMETERS
#
# [*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
#
# [*member_role_id*]
# (Optional) Similar to the member_role_name option, this represents the
# default role ID used to associate users with their default projects in the
@ -472,12 +447,6 @@ class keystone(
$purge_config = false,
$amqp_durable_queues = $::os_service_default,
# DEPRECATED PARAMETERS
$database_connection = undef,
$database_idle_timeout = undef,
$database_max_retries = undef,
$database_retry_interval = undef,
$database_max_pool_size = undef,
$database_max_overflow = undef,
$member_role_id = undef,
$member_role_name = undef,
$admin_endpoint = undef,
@ -507,37 +476,6 @@ class keystone(
include keystone::db
include keystone::params
if $database_connection != undef {
warning('The database_connection parameter is deprecated and will be \
removed in a future realse. Use keystone::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 keystone::db::database_connection_recycle_time \
instead')
}
if $database_max_retries!= undef {
warning('The database_max_retries parameter is deprecated and will be \
removed in a future realse. Use keystone::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 keystone::db::database_retry_interval 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 keystone::db::database_max_pool_size instead')
}
if $database_max_overflow != undef {
warning('The database_max_overflow parameter is deprecated and will be \
removed in a future realse. Use keystone::db::database_max_overflow instead')
}
if $member_role_id != undef {
warning('The keystone::member_role_id parameter is deprecated and has no effect')
}

11
releasenotes/notes/remove-database-params-4bac67a63c54e2fd.yaml Normal file
View File

@ -0,0 +1,11 @@
---
features:
- |
The following parameters of the ``keystone`` class has been removed.
- ``database_connection``
- ``database_idle_timeout``
- ``database_max_overflow``
- ``database_max_pool_size``
- ``database_max_retries``
- ``database_retry_interval``