openstack/heat
Code Issues Proposed changes

Merge "Don't use two different names for the same flag"

Browse Source
This commit is contained in:
Jenkins 2016-05-09 05:14:17 +00:00 committed by Gerrit Code Review
commit 7fa14d071b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,7 +54,6 @@ class StackResource(resource.Resource):
def __init__(self, name, json_snippet, stack): def __init__(self, name, json_snippet, stack):
super(StackResource, self).__init__(name, json_snippet, stack) super(StackResource, self).__init__(name, json_snippet, stack)
self.nested_abandon_in_progress = False
self._nested = None self._nested = None
self.resource_info = None self.resource_info = None
@ -456,7 +455,7 @@ class StackResource(resource.Resource):
stack_identity = dict(stack.identifier()) stack_identity = dict(stack.identifier())
try: try:
if self.nested_abandon_in_progress: if self.abandon_in_progress:
self.rpc_client().abandon_stack(self.context, stack_identity) self.rpc_client().abandon_stack(self.context, stack_identity)
else: else:
self.rpc_client().delete_stack(self.context, stack_identity) self.rpc_client().delete_stack(self.context, stack_identity)
@ -513,7 +512,7 @@ class StackResource(resource.Resource):
return self._check_status_complete(self.CHECK) return self._check_status_complete(self.CHECK)
def prepare_abandon(self): def prepare_abandon(self):
self.nested_abandon_in_progress = True self.abandon_in_progress = True
nested_stack = self.nested() nested_stack = self.nested()
if nested_stack: if nested_stack:
return self.nested().prepare_abandon() return self.nested().prepare_abandon()