diff --git a/cloud/cloudformation b/cloud/cloudformation
index ae9f2e0f26f..41323ac562b 100644
--- a/cloud/cloudformation
+++ b/cloud/cloudformation
@@ -141,12 +141,12 @@ def stack_operation(cfn, stack_name, operation):
                           output = 'Stack %s complete' % operation)
             break
         if '%s_ROLLBACK_COMPLETE' % operation == stack.stack_status:
-            result = dict(changed=True,
+            result = dict(changed=True, failed=True,
                           events = map(str, list(stack.describe_events())),
                           output = 'Problem with %s. Rollback complete' % operation)
             break
         elif '%s_FAILED' % operation == stack.stack_status:
-            result = dict(changed=False,
+            result = dict(changed=True, failed=True,
                           events = map(str, list(stack.describe_events())),
                           output = 'Stack %s failed' % operation)
             break