openstack/puppet-heat
Code Issues Proposed changes

Remove deprecated heat::max_stack_per_tenant

Browse Source 
... because it was deprecated during Xena cycle by [1].

[1] e79e74cd08

Change-Id: I3806ab51e6593a9e00172af6b1eb02d9812fcf72
This commit is contained in:
Takashi Kajinami 2022-05-13 08:51:00 +09:00
parent 0585656937
commit 68ec6e99d3
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/engine.pp
View File

@ -265,8 +265,6 @@ class heat::engine (
} }
} }
$max_stacks_per_tenant_real = pick($::heat::max_stacks_per_tenant, $max_stacks_per_tenant)
heat_config { heat_config {
'DEFAULT/auth_encryption_key': value => $auth_encryption_key, secret => true; 'DEFAULT/auth_encryption_key': value => $auth_encryption_key, secret => true;
'DEFAULT/heat_stack_user_role': value => $heat_stack_user_role; 'DEFAULT/heat_stack_user_role': value => $heat_stack_user_role;
@ -278,7 +276,7 @@ class heat::engine (
'DEFAULT/reauthentication_auth_method': value => $reauthentication_auth_method; 'DEFAULT/reauthentication_auth_method': value => $reauthentication_auth_method;
'DEFAULT/allow_trusts_redelegation': value => $allow_trusts_redelegation; 'DEFAULT/allow_trusts_redelegation': value => $allow_trusts_redelegation;
'DEFAULT/trusts_delegated_roles': value => join(any2array($trusts_delegated_roles), ','); 'DEFAULT/trusts_delegated_roles': value => join(any2array($trusts_delegated_roles), ',');
'DEFAULT/max_stacks_per_tenant': value => $max_stacks_per_tenant_real; 'DEFAULT/max_stacks_per_tenant': value => $max_stacks_per_tenant;
'DEFAULT/max_resources_per_stack': value => $max_resources_per_stack; 'DEFAULT/max_resources_per_stack': value => $max_resources_per_stack;
'DEFAULT/action_retry_limit': value => $action_retry_limit; 'DEFAULT/action_retry_limit': value => $action_retry_limit;
'DEFAULT/client_retry_limit': value => $client_retry_limit; 'DEFAULT/client_retry_limit': value => $client_retry_limit;

12
manifests/init.pp
View File

@ -238,11 +238,6 @@
# #
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
# #
# [*max_stacks_per_tenant*]
# (optional) Maximum number of stacks any one tenant may have active at one
# time.
# Defaults to undef
#
# [*heat_clients_url*] # [*heat_clients_url*]
# (optional) Heat url in format like http://0.0.0.0:8004/v1/%(tenant_id)s. # (optional) Heat url in format like http://0.0.0.0:8004/v1/%(tenant_id)s.
# Defaults to undef # Defaults to undef
@ -303,7 +298,6 @@ class heat(
$yaql_memory_quota = $::os_service_default, $yaql_memory_quota = $::os_service_default,
$yaql_limit_iterators = $::os_service_default, $yaql_limit_iterators = $::os_service_default,
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$max_stacks_per_tenant = undef,
$heat_clients_url = undef, $heat_clients_url = undef,
$heat_clients_endpoint_type = undef, $heat_clients_endpoint_type = undef,
) { ) {
@ -312,12 +306,6 @@ class heat(
include heat::deps include heat::deps
include heat::params include heat::params
if $max_stacks_per_tenant != undef {
warning('The max_stacks_per_tenant parameter is deprecated. \
Use heat::engine::max_stacks_per_tenant instead.')
include heat::engine
}
if $auth_strategy == 'keystone' { if $auth_strategy == 'keystone' {
include heat::keystone::authtoken include heat::keystone::authtoken
} }

5
releasenotes/notes/remove-max_stack_per_tenant-from-base-8a04026d94184d65.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
The ``heat::max_stacks_per_tenant`` parameter has been removed. Use
the ``heat::engine::max_stacks_per_tenant`` parameter instead.