openstack
/
heat
Code Issues Proposed changes

Merge "Allow turning off max_stacks limit"

This commit is contained in:
Zuul 2021-03-15 14:05:32 +00:00 committed by Gerrit Code Review
parent 439d42f902 c5fdc08849
commit c7babfd3c2
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
heat/common/config.py
View File

@ -154,9 +154,9 @@ engine_opts = [
help=_('Maximum resources allowed per top-level stack. ' help=_('Maximum resources allowed per top-level stack. '
'-1 stands for unlimited.')), '-1 stands for unlimited.')),
cfg.IntOpt('max_stacks_per_tenant', cfg.IntOpt('max_stacks_per_tenant',
default=100, default=512,
help=_('Maximum number of stacks any one tenant may have' help=_('Maximum number of stacks any one tenant may have '
' active at one time.')), 'active at one time. -1 stands for unlimited.')),
cfg.IntOpt('action_retry_limit', cfg.IntOpt('action_retry_limit',
default=5, default=5,
help=_('Number of times to retry to bring a ' help=_('Number of times to retry to bring a '

3
heat/engine/service.py
View File

@ -682,7 +682,8 @@ class EngineService(service.ServiceBase):
# Do not stack limit check for admin since admin can see all stacks. # Do not stack limit check for admin since admin can see all stacks.
if not cnxt.is_admin: if not cnxt.is_admin:
tenant_limit = cfg.CONF.max_stacks_per_tenant tenant_limit = cfg.CONF.max_stacks_per_tenant
if stack_object.Stack.count_all(cnxt) >= tenant_limit: if (tenant_limit >= 0 and
stack_object.Stack.count_all(cnxt) >= tenant_limit):
message = _("You have reached the maximum stacks per tenant, " message = _("You have reached the maximum stacks per tenant, "
"%d. Please delete some stacks.") % tenant_limit "%d. Please delete some stacks.") % tenant_limit
raise exception.RequestLimitExceeded(message=message) raise exception.RequestLimitExceeded(message=message)