heat engine : Disable stack rollback by default

Until the event-persistence BP is implemented, we should
disable stack rollback by default and make it opt-in.

fixes bug 1131303

Change-Id: I101e108c3959c4b7b4cfc68449ba2b989b157626

diff --git a/heat/engine/parser.py b/heat/engine/parser.py
index da0157d2cb12040823ffa420dbacbf84e0620179..1c5f36dfb9f1806882298df2dab22f87319437e8 100644 (file)
--- a/heat/engine/parser.py
+++ b/heat/engine/parser.py
@@ -60,7 +60,7 @@ class Stack(object):
 
     def __init__(self, context, stack_name, tmpl, parameters=None,
                  stack_id=None, state=None, state_description='',
-                 timeout_mins=60, resolve_data=True, disable_rollback=False):
+                 timeout_mins=60, resolve_data=True, disable_rollback=True):
         '''
         Initialise from a context, name, Template object and (optionally)
         Parameters object. The database ID may also be initialised, if the

diff --git a/heat/tests/test_parser.py b/heat/tests/test_parser.py
index e5ff141bb2eac5a99956594be85e5c057e33013c..5191ae4a991929c334560ff1f8965b8ff7dc4c28 100644 (file)
--- a/heat/tests/test_parser.py
+++ b/heat/tests/test_parser.py
@@ -411,7 +411,7 @@ class StackTest(unittest.TestCase):
     @stack_delete_after
     def test_delete_rollback(self):
         self.stack = parser.Stack(self.ctx, 'delete_rollback_test',
-                                  parser.Template({}))
+                                  parser.Template({}), disable_rollback=False)
         stack_id = self.stack.store()
 
         db_s = db_api.stack_get(self.ctx, stack_id)
@@ -657,7 +657,8 @@ class StackTest(unittest.TestCase):
                                             'Properties': {'Foo': 'abc'}}}}
 
         self.stack = parser.Stack(self.ctx, 'update_test_stack',
-                                  template.Template(tmpl))
+                                  template.Template(tmpl),
+                                  disable_rollback=False)
         self.stack.store()
         self.stack.create()
         self.assertEqual(self.stack.state, parser.Stack.CREATE_COMPLETE)
@@ -700,7 +701,8 @@ class StackTest(unittest.TestCase):
                                             'Properties': {'Foo': 'abc'}}}}
 
         self.stack = parser.Stack(self.ctx, 'update_test_stack',
-                                  template.Template(tmpl))
+                                  template.Template(tmpl),
+                                  disable_rollback=False)
         self.stack.store()
         self.stack.create()
         self.assertEqual(self.stack.state, parser.Stack.CREATE_COMPLETE)
@@ -737,7 +739,8 @@ class StackTest(unittest.TestCase):
         tmpl = {'Resources': {'AResource': {'Type': 'GenericResourceType'}}}
 
         self.stack = parser.Stack(self.ctx, 'update_test_stack',
-                                  template.Template(tmpl))
+                                  template.Template(tmpl),
+                                  disable_rollback=False)
         self.stack.store()
         self.stack.create()
         self.assertEqual(self.stack.state, parser.Stack.CREATE_COMPLETE)
@@ -767,7 +770,8 @@ class StackTest(unittest.TestCase):
                 'BResource': {'Type': 'GenericResourceType'}}}
 
         self.stack = parser.Stack(self.ctx, 'update_test_stack',
-                                  template.Template(tmpl))
+                                  template.Template(tmpl),
+                                  disable_rollback=False)
         self.stack.store()
         self.stack.create()
         self.assertEqual(self.stack.state, parser.Stack.CREATE_COMPLETE)