openstack
/
heat
Code Issues Proposed changes

Merge "Catch NotSupported when cancelling a nested stack"

This commit is contained in:
Jenkins 2016-08-15 02:55:31 +00:00 committed by Gerrit Code Review
parent 7cf0df5c28 d12161cf55
commit dfe3f4f740
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
heat/engine/resources/stack_resource.py
View File

@ -416,10 +416,13 @@ class StackResource(resource.Resource):
if stack_identity is None:
return False
self.rpc_client().stack_cancel_update(
self.context,
dict(stack_identity),
cancel_with_rollback=True)
try:
self.rpc_client().stack_cancel_update(
self.context,
dict(stack_identity),
cancel_with_rollback=True)
except exception.NotSupported:
return False
try:
data = stack_object.Stack.get_status(self.context,
@ -497,10 +500,14 @@ class StackResource(resource.Resource):
def handle_update_cancel(self, cookie):
stack_identity = self.nested_identifier()
if stack_identity is not None:
self.rpc_client().stack_cancel_update(
self.context,
dict(stack_identity),
cancel_with_rollback=False)
try:
self.rpc_client().stack_cancel_update(
self.context,
dict(stack_identity),
cancel_with_rollback=False)
except exception.NotSupported:
LOG.debug('Nested stack %s not in cancellable state',
stack_identity.stack_name)
def handle_create_cancel(self, cookie):
return self.handle_update_cancel(cookie)