diff --git a/manifests/engine.pp b/manifests/engine.pp index 22f3fa3c..e084c869 100644 --- a/manifests/engine.pp +++ b/manifests/engine.pp @@ -265,8 +265,6 @@ class heat::engine ( } } - $max_stacks_per_tenant_real = pick($::heat::max_stacks_per_tenant, $max_stacks_per_tenant) - heat_config { 'DEFAULT/auth_encryption_key': value => $auth_encryption_key, secret => true; '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/allow_trusts_redelegation': value => $allow_trusts_redelegation; '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/action_retry_limit': value => $action_retry_limit; 'DEFAULT/client_retry_limit': value => $client_retry_limit; diff --git a/manifests/init.pp b/manifests/init.pp index dacc3c51..c9a1a6f4 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -238,11 +238,6 @@ # # 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*] # (optional) Heat url in format like http://0.0.0.0:8004/v1/%(tenant_id)s. # Defaults to undef @@ -303,7 +298,6 @@ class heat( $yaql_memory_quota = $::os_service_default, $yaql_limit_iterators = $::os_service_default, # DEPRECATED PARAMETERS - $max_stacks_per_tenant = undef, $heat_clients_url = undef, $heat_clients_endpoint_type = undef, ) { @@ -312,12 +306,6 @@ class heat( include heat::deps 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' { include heat::keystone::authtoken } diff --git a/releasenotes/notes/remove-max_stack_per_tenant-from-base-8a04026d94184d65.yaml b/releasenotes/notes/remove-max_stack_per_tenant-from-base-8a04026d94184d65.yaml new file mode 100644 index 00000000..a1df72df --- /dev/null +++ b/releasenotes/notes/remove-max_stack_per_tenant-from-base-8a04026d94184d65.yaml @@ -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.