openstack
/
heat-templates
Code Issues Proposed changes

OS::Metering::Alarm -> OS::Ceilometer::Alarm 

Don't require any special yaml mappings in the environments
section to deal with metering

Change-Id: Ic7055e326cf8f75f97047f028c767ee8bc944fe8
This commit is contained in:
Steven Dake 2013-12-17 08:19:29 -07:00
parent 60347b3c99
commit 1d76512ae1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cfn/F17/AutoScalingCeilometer.yaml
View File

@ -59,7 +59,7 @@ Resources:
Cooldown: '60'
ScalingAdjustment: '-1'
CPUAlarmHigh:
Type: OS::Metering::Alarm
Type: OS::Ceilometer::Alarm
Properties:
description: Scale-up if the average CPU > 50% for 1 minute
meter_name: cpu_util
@ -72,7 +72,7 @@ Resources:
matching_metadata: {'metadata.user_metadata.groupname': {Ref: 'WebServerGroup'}}
comparison_operator: gt
CPUAlarmLow:
Type: OS::Metering::Alarm
Type: OS::Ceilometer::Alarm
Properties:
description: Scale-down if the average CPU < 15% for 1 minute
meter_name: cpu_util