Remove some deprecated database parameters left

This is follow-up of c543bd33ae and
removes some deprecated database parameters still left.

Change-Id: I6325c5d8d290bf6176d17e4aea9058f85feea2f3
This commit is contained in:
Takashi Kajinami 2022-02-08 22:05:29 +09:00
parent ea93973b79
commit ff16bee10a
5 changed files with 1 additions and 43 deletions

View File

@ -47,12 +47,6 @@
# (Optional) Run db sync on nodes after connection setting has been set.
# Defaults to true
#
# DEPRECATED PARAMETERS
#
# [*database_min_pool_size*]
# Minimum number of SQL connections to keep open in a pool.
# (Optional) Defaults to undef
#
class heat::db (
$database_connection = 'sqlite:////var/lib/heat/heat.sqlite',
$database_connection_recycle_time = $::os_service_default,
@ -64,8 +58,6 @@ class heat::db (
$mysql_enable_ndb = $::os_service_default,
$database_db_max_retries = $::os_service_default,
$sync_db = true,
# DEPRECATED PARAMETERS
$database_min_pool_size = undef,
) {
include heat::deps

View File

@ -208,10 +208,6 @@
# (Optional) Enable the stack-abandon feature.
# Defaults to $::os_service_default.
#
# [*sync_db*]
# (Optional) Run db sync on nodes after connection setting has been set.
# Defaults to undef
#
# [*enable_proxy_headers_parsing*]
# (Optional) Enable paste middleware to handle SSL requests through
# HTTPProxyToWSGI middleware.
@ -311,7 +307,6 @@ class heat(
$yaql_memory_quota = $::os_service_default,
$yaql_limit_iterators = $::os_service_default,
# DEPRECATED PARAMETERS
$sync_db = undef,
$amqp_allow_insecure_clients = undef,
$max_stacks_per_tenant = undef,
) {

View File

@ -10,6 +10,7 @@ upgrade:
- ``database_max_pool_size``
- ``database_max_retries``
- ``database_retry_interval``
- ``sync_db``
- |
The ``database_min_pool_size`` parameter of the ``heat::db`` class has been

View File

@ -88,21 +88,6 @@ describe 'heat::api_cfn' do
end
end
context 'with $sync_db set to false in ::heat' do
let :pre_condition do
"class { 'heat::keystone::authtoken':
password => 'a_big_secret',
}
class {'heat':
sync_db => false
}"
end
it 'configures heat-api-cfn service to not subscribe to the dbsync resource' do
is_expected.to contain_service('heat-api-cfn').that_subscribes_to(nil)
end
end
end
on_supported_os({

View File

@ -87,21 +87,6 @@ describe 'heat::api' do
is_expected.to_not contain_service('heat-api')
end
end
context 'with $sync_db set to false in ::heat' do
let :pre_condition do
"class { 'heat::keystone::authtoken':
password => 'a_big_secret',
}
class {'heat':
sync_db => false,
}"
end
it 'configures heat-api service to not subscribe to the dbsync resource' do
is_expected.to contain_service('heat-api').that_subscribes_to(nil)
end
end
end
on_supported_os({