summaryrefslogtreecommitdiff
path: root/heat/engine/service.py
diff options
context:
space:
mode:
Diffstat (limited to 'heat/engine/service.py')
-rw-r--r--heat/engine/service.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/heat/engine/service.py b/heat/engine/service.py
index d16699f3e..00c7f2c61 100644
--- a/heat/engine/service.py
+++ b/heat/engine/service.py
@@ -682,7 +682,8 @@ class EngineService(service.ServiceBase):
# Do not stack limit check for admin since admin can see all stacks.
if not cnxt.is_admin:
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, "
"%d. Please delete some stacks.") % tenant_limit
raise exception.RequestLimitExceeded(message=message)