openstack
/
heat
Code Issues Proposed changes

Revert "Enable abandon option to nested resource" 

This reverts commit 103a09bc1c.

Reverting this patch because it caused the nested stacks to hang around,
when they should really be deleted too during an abandon.

Change-Id: I7865dd97b43aec7f17734b8311b78facb9d75ccc
This commit is contained in:
Drago Rosson 2016-04-21 16:11:54 -05:00
parent c093d8016d
commit 633e745aad
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -509,7 +509,6 @@ class StackResource(resource.Resource):
return self._check_status_complete(self.CHECK)
def prepare_abandon(self):
self.abandon_in_progress = True
nested_stack = self.nested()
if nested_stack:
return self.nested().prepare_abandon()

8
heat/tests/test_stack_resource.py
View File

@ -200,14 +200,6 @@ class StackResourceTest(StackResourceBaseTest):
ret = self.parent_resource.prepare_abandon()
self.assertEqual({}, ret)
def test_abandon_nested_not_deleted(self):
delete_nested = self.patchobject(self.parent_resource, 'delete_nested')
self.parent_stack.prepare_abandon()
self.parent_stack.delete(abandon=True)
self.assertEqual(0, delete_nested.call_count)
def test_propagated_files(self):
"""Test passing of the files map in the top level to the child.