diff options
| author | huangtianhua <huangtianhua@huawei.com> | 2016-06-08 15:50:39 +0800 |
|---|---|---|
| committer | huangtianhua <huangtianhua@huawei.com> | 2016-06-29 02:50:27 +0000 |
| commit | 4a79f7ca539f92a38e554db718d20a51f302565f (patch) | |
| tree | 6cd6c4baa85febd2496e9b9e20e0657b87161a7b /etc/heat | |
| parent | 47262c079d0e0f1dbdeaeb071acb1dc8317a5723 (diff) | |
| download | heat-4a79f7ca539f92a38e554db718d20a51f302565f.tar.gz | |
Migrate to aodh for OS::Ceilometer::Alarm
This changes:
1. use aodhclient to manage OS::Ceilometer::Alarm
resource, including create, update, delete, check, suspend,
resume and show.
2. rename OS::Ceilometer::Alarm to OS::Aodh::Alarm
3. considering to compatible with old templates with resource
OS::Ceilometer::Alarm, set resource_registry to map Ceilometer alarm
to Aodh alarm
Blueprint migrate-to-use-aodh-for-alarms
Change-Id: I6e2d14f15a345b927b53adc237cf2bf4010842f0
Diffstat (limited to 'etc/heat')
| -rw-r--r-- | etc/heat/environment.d/default.yaml | 3 | ||||
| -rw-r--r-- | etc/heat/templates/AWS_CloudWatch_Alarm.yaml | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/etc/heat/environment.d/default.yaml b/etc/heat/environment.d/default.yaml index 143ee48c5..fb680c43c 100644 --- a/etc/heat/environment.d/default.yaml +++ b/etc/heat/environment.d/default.yaml @@ -5,5 +5,6 @@ resource_registry: # Choose your implementation of AWS::CloudWatch::Alarm "AWS::CloudWatch::Alarm": "file:///etc/heat/templates/AWS_CloudWatch_Alarm.yaml" #"AWS::CloudWatch::Alarm": "OS::Heat::CWLiteAlarm" - "OS::Metering::Alarm": "OS::Ceilometer::Alarm" + "OS::Metering::Alarm": "OS::Aodh::Alarm" "AWS::RDS::DBInstance": "file:///etc/heat/templates/AWS_RDS_DBInstance.yaml" + "OS::Ceilometer::Alarm": "OS::Aodh::Alarm" diff --git a/etc/heat/templates/AWS_CloudWatch_Alarm.yaml b/etc/heat/templates/AWS_CloudWatch_Alarm.yaml index 2e5f36625..f3ee6be6a 100644 --- a/etc/heat/templates/AWS_CloudWatch_Alarm.yaml +++ b/etc/heat/templates/AWS_CloudWatch_Alarm.yaml @@ -60,7 +60,7 @@ Mappings: Resources: __alarm__: - Type: OS::Ceilometer::Alarm + Type: OS::Aodh::Alarm Properties: description: Ref: AlarmDescription |