From: Steven Hardy <shardy@redhat.com>
Date: Fri, 18 Jan 2013 17:34:12 +0000 (+0000)
Subject: heat engine : watchrule save state when actions undefined
X-Git-Tag: 2014.1~980^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=4999f652fbe4d80081c019c4db09aac475d10a3d;p=openstack-build%2Fheat-build.git

heat engine : watchrule save state when actions undefined

We should save WatchRule state transitions, even if an action
for that state has not been defined in the template.

Change-Id: Iadca203d03b2c2a2a186a4e9574687d8f30ab080
Signed-off-by: Steven Hardy <shardy@redhat.com>
---

diff --git a/heat/engine/watchrule.py b/heat/engine/watchrule.py
index da33f4b5..a5aa5a74 100644
--- a/heat/engine/watchrule.py
+++ b/heat/engine/watchrule.py
@@ -220,8 +220,8 @@ class WatchRule(object):
         new_state = self.get_alarm_state()
 
         if new_state != self.state:
-            if self.rule_action(new_state):
-                self.state = new_state
+            action = self.rule_action(new_state)
+            self.state = new_state
 
         self.last_evaluated = self.now
         self.store()