Remove deprecated oslo::db::use_tpool

The parameter was deprecated during Yoga cycle[1] and is no longer used
by the other modules.

[1] af6514829c

Change-Id: I9c15808bc1725be7ec6e24b37c066c089990e85e
This commit is contained in:
Takashi Kajinami 2022-09-21 00:33:20 +09:00
parent f5db3abb0f
commit 5590e9b164
3 changed files with 4 additions and 16 deletions

View File

@ -107,12 +107,6 @@
# Cluster (NDB).
# Defaults to $::os_service_default
#
# DEPRECATED PARAMETERS
#
# [*use_tpool*]
# (Optional) Enable the experimental use of thread pooling for all DB API calls (boolean value)
# Defaults to undef
#
define oslo::db(
$config = $name,
$config_group = 'database',
@ -137,8 +131,6 @@ define oslo::db(
$db_max_retry_interval = $::os_service_default,
$db_max_retries = $::os_service_default,
$mysql_enable_ndb = $::os_service_default,
# DEPRECATED PARAMETERS
$use_tpool = undef,
) {
include oslo::params
@ -181,10 +173,6 @@ define oslo::db(
}
}
if $use_tpool != undef {
warning('The use_tpool parameter is deprecated and will be removed in a future release.')
}
$database_options = {
"${config_group}/sqlite_synchronous" => { value => $sqlite_synchronous },
"${config_group}/backend" => { value => $backend },
@ -204,7 +192,6 @@ define oslo::db(
"${config_group}/db_inc_retry_interval" => { value => $db_inc_retry_interval },
"${config_group}/db_max_retry_interval" => { value => $db_max_retry_interval },
"${config_group}/db_max_retries" => { value => $db_max_retries },
"${config_group}/use_tpool" => { value => pick($use_tpool, $::os_service_default) },
"${config_group}/mysql_enable_ndb" => { value => $mysql_enable_ndb },
}

View File

@ -0,0 +1,4 @@
---
upgrade:
- |
The deprecated ``oslo::db::use_tpool`` parameter has been removed.

View File

@ -26,7 +26,6 @@ describe 'oslo::db' do
is_expected.to contain_keystone_config('database/db_inc_retry_interval').with_value('<SERVICE DEFAULT>')
is_expected.to contain_keystone_config('database/db_max_retry_interval').with_value('<SERVICE DEFAULT>')
is_expected.to contain_keystone_config('database/db_max_retries').with_value('<SERVICE DEFAULT>')
is_expected.to contain_keystone_config('database/use_tpool').with_value('<SERVICE DEFAULT>')
is_expected.to contain_keystone_config('database/mysql_enable_ndb').with_value('<SERVICE DEFAULT>')
end
end
@ -51,7 +50,6 @@ describe 'oslo::db' do
:db_inc_retry_interval => true,
:db_max_retry_interval => '10',
:db_max_retries => '20',
:use_tpool => true,
:mysql_enable_ndb => true,
}
end
@ -73,7 +71,6 @@ describe 'oslo::db' do
is_expected.to contain_keystone_config('custom_group/db_inc_retry_interval').with_value(true)
is_expected.to contain_keystone_config('custom_group/db_max_retry_interval').with_value('10')
is_expected.to contain_keystone_config('custom_group/db_max_retries').with_value('20')
is_expected.to contain_keystone_config('custom_group/use_tpool').with_value(true)
is_expected.to contain_keystone_config('custom_group/mysql_enable_ndb').with_value(true)
end
end