openstack/heat
Code Issues Proposed changes

Merge "Fix SoftwareDeployment on DELETE action"

Browse Source
This commit is contained in:
Zuul 2019-03-20 19:02:01 +00:00 committed by Gerrit Code Review
commit 7b156dd846
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
heat/engine/stack.py
View File

@ -823,11 +823,11 @@ class Stack(collections.Mapping):
def access_allowed(self, credential_id, resource_name):
"""Is credential_id authorised to access resource by resource_name."""
if not self.resources:
# this also triggers lazy-loading of resources
# so is required for register_access_allowed_handler
# to be called
return False
if not self.resources or resource_name not in self.resources:
# this handle the case that sd in action delete,
# try to load access_allowed_handlers if resources object
# haven't been loaded.
[res.name for res in self.iter_resources()]
handler = self._access_allowed_handlers.get(credential_id)
return handler and handler(resource_name)