diff options
author | Zuul <zuul@review.opendev.org> | 2019-08-08 14:46:21 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2019-08-08 14:46:21 +0000 |
commit | ad54909f4274d90bee4455e615ec32338cad0c3a (patch) | |
tree | 3dcb4af6700ed7169a55265335e63fbc4d48bb79 | |
parent | 94f5f3fe25f2e824aa3b20828e3336c7ba644d4c (diff) | |
parent | cc01d5da4e8b8afc1fe4ca8b250ab0f1020d88eb (diff) | |
download | heat-ad54909f4274d90bee4455e615ec32338cad0c3a.tar.gz |
Merge "Do not perform the tenant stack limit check for admin user" into stable/queens
-rw-r--r-- | heat/engine/service.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/heat/engine/service.py b/heat/engine/service.py index 9dc9c1400..b586142cc 100644 --- a/heat/engine/service.py +++ b/heat/engine/service.py @@ -668,11 +668,13 @@ class EngineService(service.ServiceBase): if stack_object.Stack.get_by_name(cnxt, stack_name): raise exception.StackExists(stack_name=stack_name) - tenant_limit = cfg.CONF.max_stacks_per_tenant - if 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) + # 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: + message = _("You have reached the maximum stacks per tenant, " + "%d. Please delete some stacks.") % tenant_limit + raise exception.RequestLimitExceeded(message=message) self._validate_template(cnxt, parsed_template) def _validate_template(self, cnxt, parsed_template): |