From: Steven Hardy <shardy@redhat.com>
Date: Mon, 4 Mar 2013 15:29:36 +0000 (+0000)
Subject: heat clients : Make heat-boto rollback disabled by default
X-Git-Tag: 2014.1~822
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d02b0889c637c26b840939662d4d51358169b892;p=openstack-build%2Fheat-build.git

heat clients : Make heat-boto rollback disabled by default

The boto library always sends the DisableRollback parameter,
defaulted to False, which is the opposite of the engine
default now, so we have to set DisableRollback to True in
the boto client wrapper

ref bug 1131303

Change-Id: I4acbba7b37f24cb1a874292ff2323ae24b630edf
---

diff --git a/heat/cfn_client/boto_client.py b/heat/cfn_client/boto_client.py
index 1f35c109..d0c86f3c 100644
--- a/heat/cfn_client/boto_client.py
+++ b/heat/cfn_client/boto_client.py
@@ -39,10 +39,9 @@ class BotoClient(CloudFormationConnection):
         return super(BotoClient, self).describe_stacks(stack_name)
 
     def create_stack(self, **kwargs):
-        disable_rollback = False
-        if 'DisableRollback' in kwargs:
-            if str(kwargs['DisableRollback']).lower() == 'true':
-                disable_rollback = True
+        disable_rollback = True
+        if str(kwargs.get('DisableRollback', '')).lower() == 'false':
+            disable_rollback = False
 
         if 'TemplateUrl' in kwargs:
             return super(BotoClient, self).create_stack(