openstack/heat
Code Issues Proposed changes

Merge "Repeat Ceilometer alarm actions by default"

Browse Source
This commit is contained in:
Jenkins 2013-10-24 04:22:04 +00:00 committed by Gerrit Code Review
commit 80c742c7ad
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/heat/templates/AWS_CloudWatch_Alarm.yaml
View File

@ -69,6 +69,7 @@ Resources:
Ref: Period Ref: Period
evaluation_periods: evaluation_periods:
Ref: EvaluationPeriods Ref: EvaluationPeriods
repeat_actions: true
threshold: threshold:
Ref: Threshold Ref: Threshold
alarm_actions: alarm_actions:

11
heat/engine/resources/ceilometer/alarm.py
View File

@ -80,12 +80,11 @@ class CeilometerAlarm(resource.Resource):
}, },
'repeat_actions': { 'repeat_actions': {
'Type': 'Boolean', 'Type': 'Boolean',
'Default': 'false', 'Default': 'true',
'Description': _('True to trigger actions each time the threshold ' 'Description': _('False to trigger actions when the threshold is '
'is reached. ' 'reached AND the alarm\'s state has changed. '
'By default, actions are called when : ' 'By default, actions are called each time '
'the threshold is reached AND the alarm\'s state ' 'the threshold is reached. ')
'have changed.')
}, },
'matching_metadata': { 'matching_metadata': {
'Type': 'Map', 'Type': 'Map',