Merge "Rename OS::Metering::Alarm to OS::Ceilometer::Alarm"

openstack · Aug 27, 2013 · 8e64406 · 8e64406
2 parents d7bb1f0 + c60a606
commit 8e64406
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/etc/heat/environment.d/default.yaml b/etc/heat/environment.d/default.yaml
@@ -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"
diff --git a/etc/heat/templates/AWS_CloudWatch_Alarm.yaml b/etc/heat/templates/AWS_CloudWatch_Alarm.yaml
@@ -59,7 +59,7 @@ Mappings:
 
 Resources:
   __alarm__:
-    Type: OS::Metering::Alarm
+    Type: OS::Ceilometer::Alarm
     Properties:
       description:
         Ref: AlarmDescription

diff --git a/heat/engine/resources/ceilometer/alarm.py b/heat/engine/resources/ceilometer/alarm.py
@@ -130,5 +130,5 @@ def handle_delete(self):
 
 def resource_mapping():
     return {
-        'OS::Metering::Alarm': CeilometerAlarm,
+        'OS::Ceilometer::Alarm': CeilometerAlarm,
     }
diff --git a/heat/tests/test_ceilometer_alarm.py b/heat/tests/test_ceilometer_alarm.py
@@ -44,7 +44,7 @@
   "Parameters" : {},
   "Resources" : {
     "MEMAlarmHigh": {
-     "Type": "OS::Metering::Alarm",
+     "Type": "OS::Ceilometer::Alarm",
      "Properties": {
         "description": "Scale-up if MEM > 50% for 1 minute",
         "counter_name": "MemoryUtilization",