Merge "api: add missing combination_rule field in sample"

2015-02-16 13:09:08 +00:00 · 2015-02-16 13:09:08 +00:00 · 3baf559227
commit 3baf559227
parent 5cd8513d9b ce2a583b59
1 changed files with 1 additions and 0 deletions
--- a/ceilometer/api/controllers/v2/alarms.py
+++ b/ceilometer/api/controllers/v2/alarms.py
@ -504,6 +504,7 @@ class Alarm(base.Base):
                   alarm_actions=["http://site:8000/alarm"],
                   insufficient_data_actions=["http://site:8000/nodata"],
                   repeat_actions=False,
+                   combination_rule=AlarmCombinationRule.sample(),
                   )

    def as_dict(self, db_model):