heat engine : watchrule don't run rule for every SampleCount

We should not be triggering a run_rule (which is an alarm action)
for every datapoint when the SampleCount statistic is specified,
otherwise e.g IHA instances get replaced every heartbeat signal!
run_rule should only be called in response to a rule evaluate(),
or an explicit override via set_watch_state()

ref bug 1100719

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

diff --git a/heat/engine/watchrule.py b/heat/engine/watchrule.py
index c29fa8f75e1bac6087960564f7199bb0244cb03e..da33f4b5e6ecffe28b4dc803aca177f342411c04 100644 (file)
--- a/heat/engine/watchrule.py
+++ b/heat/engine/watchrule.py
@@ -261,8 +261,6 @@ class WatchRule(object):
         }
         wd = db_api.watch_data_create(None, watch_data)
         logger.debug('new watch:%s data:%s' % (self.name, str(wd.data)))
-        if self.rule['Statistic'] == 'SampleCount':
-            self.run_rule()
 
     def set_watch_state(self, state):
         '''