Change namespace 'ceilometer' to 'aodh'

Change namespace of some files to '*aodh*' instead of '*ceilometer*'.

Blueprint migrate-to-use-aodh-for-alarms

Change-Id: I2c4d565ded5f9f7146b23479acd2702f976b8833
This commit is contained in:
huangtianhua 2016-06-27 11:09:45 +08:00
parent 26bab914a0
commit 8a4df57c37
10 changed files with 17 additions and 17 deletions

View File

@ -481,8 +481,8 @@ Delete
For this to work for a particular resource, the `entity` and For this to work for a particular resource, the `entity` and
`default_client_name` attributes must be overridden in the resource `default_client_name` attributes must be overridden in the resource
implementation. For example, `entity` of Ceilometer Alarm should equals implementation. For example, `entity` of Aodh Alarm should equals
to "alarms" and `default_client_name` to "ceilometer". to "alarm" and `default_client_name` to "aodh".
.. py:function:: handle_delete_snapshot(self, snapshot) .. py:function:: handle_delete_snapshot(self, snapshot)

View File

@ -50,7 +50,7 @@ heat processes will be launched in `screen` with the labels prefixed with `h-`.
Configure DevStack to enable ceilometer and aodh (if using alarms) Configure DevStack to enable ceilometer and aodh (if using alarms)
------------------------------------------------------------------ ------------------------------------------------------------------
To use ceilometer alarms you need to enable ceilometer and aodh in devstack. To use aodh alarms you need to enable ceilometer and aodh in devstack.
Adding the following lines to `[[local|localrc]]` section of `local.conf` Adding the following lines to `[[local|localrc]]` section of `local.conf`
will enable the services:: will enable the services::

View File

@ -1,5 +1,5 @@
HeatTemplateFormatVersion: '2012-12-12' HeatTemplateFormatVersion: '2012-12-12'
Description: AWS::CloudWatch::Alarm using Ceilometer. Description: AWS::CloudWatch::Alarm using Aodh.
Parameters: Parameters:
AlarmDescription: AlarmDescription:
Type: String Type: String
@ -47,16 +47,16 @@ Parameters:
Mappings: Mappings:
ComparisonOperatorMap: ComparisonOperatorMap:
LessThanOrEqualToThreshold: {Ceilometer: le} LessThanOrEqualToThreshold: {Aodh: le}
LessThanThreshold: {Ceilometer: lt} LessThanThreshold: {Aodh: lt}
GreaterThanThreshold: {Ceilometer: gt} GreaterThanThreshold: {Aodh: gt}
GreaterThanOrEqualToThreshold: {Ceilometer: ge} GreaterThanOrEqualToThreshold: {Aodh: ge}
StatisticMap: StatisticMap:
SampleCount: {Ceilometer: count} SampleCount: {Aodh: count}
Average: {Ceilometer: avg} Average: {Aodh: avg}
Sum: {Ceilometer: sum} Sum: {Aodh: sum}
Minimum: {Ceilometer: min} Minimum: {Aodh: min}
Maximum: {Ceilometer: max} Maximum: {Aodh: max}
Resources: Resources:
__alarm__: __alarm__:
@ -80,8 +80,8 @@ Resources:
insufficient_data_actions: insufficient_data_actions:
Ref: InsufficientDataActions Ref: InsufficientDataActions
statistic: statistic:
"Fn::FindInMap": [StatisticMap, {Ref: Statistic}, Ceilometer] "Fn::FindInMap": [StatisticMap, {Ref: Statistic}, Aodh]
comparison_operator: comparison_operator:
"Fn::FindInMap": [ComparisonOperatorMap, {Ref: ComparisonOperator}, Ceilometer] "Fn::FindInMap": [ComparisonOperatorMap, {Ref: ComparisonOperator}, Aodh]
matching_metadata: matching_metadata:
"Fn::MemberListToMap": [Name, Value, {Ref: Dimensions}] "Fn::MemberListToMap": [Name, Value, {Ref: Dimensions}]

View File

@ -22,7 +22,7 @@ from heat.common import exception
from heat.common import template_format from heat.common import template_format
from heat.engine.clients.os import aodh from heat.engine.clients.os import aodh
from heat.engine.clients.os import ceilometer from heat.engine.clients.os import ceilometer
from heat.engine.resources.openstack.ceilometer import alarm from heat.engine.resources.openstack.aodh import alarm
from heat.engine import rsrc_defn from heat.engine import rsrc_defn
from heat.engine import scheduler from heat.engine import scheduler
from heat.engine import stack as parser from heat.engine import stack as parser

View File

@ -17,7 +17,7 @@ import mox
from heat.common import exception from heat.common import exception
from heat.common import template_format from heat.common import template_format
from heat.engine.clients.os import aodh from heat.engine.clients.os import aodh
from heat.engine.resources.openstack.ceilometer.gnocchi import ( from heat.engine.resources.openstack.aodh.gnocchi import (
alarm as gnocchi) alarm as gnocchi)
from heat.engine import scheduler from heat.engine import scheduler
from heat.tests import common from heat.tests import common