Rename OS::Metering::Alarm to OS::Ceilometer::Alarm

The other resources are named by project so this is to
try and be more consistent.

There is a mapping to allow the original name to work.

Change-Id: If60cc577a5a770bdaada70c7eae1ae3fc1776056
changes/60/43460/3
Angus Salkeld 9 years ago
parent fb4e4a34dc
commit c60a60614b
  1. 1
      etc/heat/environment.d/default.yaml
  2. 2
      etc/heat/templates/AWS_CloudWatch_Alarm.yaml
  3. 2
      heat/engine/resources/ceilometer/alarm.py
  4. 2
      heat/tests/test_ceilometer_alarm.py

@ -5,3 +5,4 @@ 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"

@ -59,7 +59,7 @@ Mappings:
Resources:
__alarm__:
Type: OS::Metering::Alarm
Type: OS::Ceilometer::Alarm
Properties:
description:
Ref: AlarmDescription

@ -130,5 +130,5 @@ class CeilometerAlarm(resource.Resource):
def resource_mapping():
return {
'OS::Metering::Alarm': CeilometerAlarm,
'OS::Ceilometer::Alarm': CeilometerAlarm,
}

@ -44,7 +44,7 @@ alarm_template = '''
"Parameters" : {},
"Resources" : {
"MEMAlarmHigh": {
"Type": "OS::Metering::Alarm",
"Type": "OS::Ceilometer::Alarm",
"Properties": {
"description": "Scale-up if MEM > 50% for 1 minute",
"counter_name": "MemoryUtilization",

Loading…
Cancel
Save