diff options
| author | Rabi Mishra <ramishra@redhat.com> | 2014-06-02 16:28:27 +0530 |
|---|---|---|
| committer | Rabi Mishra <ramishra@redhat.com> | 2014-06-03 09:48:33 +0530 |
| commit | ce62bdc1925d9e746289c43bc0b76b41df8f2d53 (patch) | |
| tree | 71947d47b9b6cba6ca491cfc80cf2f19e7f18cec /etc | |
| parent | 61bd5f30f25f807762e138fab560f61acbf449be (diff) | |
| download | heat-ce62bdc1925d9e746289c43bc0b76b41df8f2d53.tar.gz | |
Fix default template for AWS::CloudWatch::Alarm with Ceilometer
Existing template assumes certain parameters to be delimited
strings rather than lists and uses 'Fn::Split' to convert them
to list. However, delimitedstring representations of parameters
are by default converted to list for CommaDelimitedList types.
Also includes change for CommaDelimitedList to accept empty string.
Change-Id: Ib566f1d098c575a80c4f1a975eaaaac93d70af34
Closes-Bug: #1316842
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/heat/templates/AWS_CloudWatch_Alarm.yaml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/heat/templates/AWS_CloudWatch_Alarm.yaml b/etc/heat/templates/AWS_CloudWatch_Alarm.yaml index d2c1e7b6f..e21e500d6 100644 --- a/etc/heat/templates/AWS_CloudWatch_Alarm.yaml +++ b/etc/heat/templates/AWS_CloudWatch_Alarm.yaml @@ -73,14 +73,14 @@ Resources: threshold: Ref: Threshold alarm_actions: - "Fn::Split": [",", {Ref: AlarmActions}] + Ref: AlarmActions ok_actions: - "Fn::Split": [",", {Ref: OKActions}] + Ref: OKActions insufficient_data_actions: - "Fn::Split": [",", {Ref: InsufficientDataActions}] + Ref: InsufficientDataActions statistic: "Fn::FindInMap": [StatisticMap, {Ref: Statistic}, Ceilometer] comparison_operator: "Fn::FindInMap": [ComparisonOperatorMap, {Ref: ComparisonOperator}, Ceilometer] matching_metadata: - "Fn::MemberListToMap": [Name, Value, {"Fn::Split": [",", {Ref: Dimensions}]}] + "Fn::MemberListToMap": [Name, Value, {Ref: Dimensions}] |