Merge "Just to delete the stack when adopt rollback"

heat/engine/stack.py

@@ -698,7 +698,10 @@ class Stack(collections.Mapping):
         def rollback():
             if not self.disable_rollback and self.state == (self.ADOPT,
                                                             self.FAILED):
-                self.delete(action=self.ROLLBACK)
+                # enter the same flow as abandon and just delete the stack
+                for res in self.resources.values():
+                    res.abandon_in_progress = True
+                self.delete(action=self.ROLLBACK, abandon=True)
 
         creator = scheduler.TaskRunner(
             self.stack_task,

heat/tests/test_parser.py

@@ -2011,9 +2011,13 @@ class StackTest(common.HeatTestCase):
                                   disable_rollback=False,
                                   adopt_stack_data=json.loads(adopt_data))
         self.stack.store()
+        with mock.patch.object(self.stack, 'delete',
+                               side_effect=self.stack.delete) as mock_delete:
             self.stack.adopt()
             self.assertEqual((self.stack.ROLLBACK, self.stack.COMPLETE),
                              self.stack.state)
+            mock_delete.assert_called_once_with(action=self.stack.ROLLBACK,
+                                                abandon=True)
 
     def test_resource_by_refid(self):
         tmpl = {'HeatTemplateFormatVersion': '2012-12-12',