AlarmCombination resource repeat_actions property has no effect

[Eoghan Glynn]

In order to drive Heat autoscaling, the repeat_actions attribute of a Ceilometer alarm must be set to true (as the autoscaling logic requires a continuing stream of notifications that alarm remains in the target state).

In the case of a combination alarm, the value of the repeat_actions property has no effect on the alarm creation, so this attribute defaults to false on the Ceilometer side.

This occurs because the Heat AlarmCombination resource incorrectly places the repeat_actions value within the combination rule, instead of at the top-level of the alarm representation:

 {"alarm_actions": [<URL>], "type": "combination", "combination_rule": {"operator": "and", "alarm_ids": ["ALARM1_ID", "ALARM2_ID"], "repeat_actions": true}, "name": "Combination Alarm"}

instead of:

 {"alarm_actions": [<URL>], "type": "combination", "combination_rule": {"operator": "and", "alarm_ids": ["ALARM1_ID", "ALARM2_ID"]}, "repeat_actions": true, "name": "Combination Alarm"}

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/135576

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/135576
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=02ec693a4701f3423be811a3a5de334c78744465
Submitter: Jenkins
Branch: master

commit 02ec693a4701f3423be811a3a5de334c78744465
Author: Eoghan Glynn <email address hidden>
Date: Wed Nov 19 11:52:38 2014 +0000

    Correctly set CombinationAlarm repeat_actions

    Previously, the value of the repeat_actions property has no effect on
    combination alarm creation, so this attribute defaulted to false on the
    Ceilometer side, breaking Heat autoscaling.

    Now, this attribute is set correctly as a top-level attribute on the
    alarm.

    Closes-Bug: #1394159

    Change-Id: I1335d5664e9f3f408fbe6815d6cd6fd0a75ba1b8

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/juno
Review: https://review.openstack.org/135870

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/135870
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=0401e75f23666612cc45f91bbb9b5efe97d56581
Submitter: Jenkins
Branch: stable/juno

commit 0401e75f23666612cc45f91bbb9b5efe97d56581
Author: Eoghan Glynn <email address hidden>
Date: Wed Nov 19 11:52:38 2014 +0000

    Correctly set CombinationAlarm repeat_actions

    Previously, the value of the repeat_actions property has no effect on
    combination alarm creation, so this attribute defaulted to false on the
    Ceilometer side, breaking Heat autoscaling.

    Now, this attribute is set correctly as a top-level attribute on the
    alarm.

    Closes-Bug: #1394159

    Change-Id: I1335d5664e9f3f408fbe6815d6cd6fd0a75ba1b8
    (cherry picked from commit 02ec693a4701f3423be811a3a5de334c78744465)