diff options
| author | Angus Salkeld <asalkeld@mirantis.com> | 2014-09-25 08:26:36 +1000 |
|---|---|---|
| committer | Angus Salkeld <asalkeld@mirantis.com> | 2014-09-25 19:42:28 +1000 |
| commit | 33eb87b3e2d8da3ba11901c4762c19b0fc740dab (patch) | |
| tree | 5d9e5a1891918d4e2ac38ada7dc20a8caffe3551 /etc | |
| parent | 7555fc9f0446e83aa5964293ab36e741ea06f618 (diff) | |
| download | heat-33eb87b3e2d8da3ba11901c4762c19b0fc740dab.tar.gz | |
Add an option to disable cloud watch lite
This also adds a deprecation warning.
This also changes the default to use Ceilometer.
Release message:
Anyone deploying Heat should not be using OS::Heat::CWLiteAlarm, but
OS::Ceilometer::Alarm.
CWLiteAlarm should be explictly disabled in /etc/heat/heat.conf by
setting "enable_cloud_watch_lite=false". This will stop Heat from
running a period task check for alarms.
DocImpact
Change-Id: I2a10c14772bdafc001e211d7e94502ac1f6b32b1
Closes-bug: #1322128
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/heat/environment.d/default.yaml | 4 | ||||
| -rw-r--r-- | etc/heat/heat.conf.sample | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/etc/heat/environment.d/default.yaml b/etc/heat/environment.d/default.yaml index dae1e37b2..143ee48c5 100644 --- a/etc/heat/environment.d/default.yaml +++ b/etc/heat/environment.d/default.yaml @@ -3,7 +3,7 @@ resource_registry: # allow older templates with Quantum in them. "OS::Quantum*": "OS::Neutron*" # Choose your implementation of AWS::CloudWatch::Alarm - #"AWS::CloudWatch::Alarm": "file:///etc/heat/templates/AWS_CloudWatch_Alarm.yaml" - "AWS::CloudWatch::Alarm": "OS::Heat::CWLiteAlarm" + "AWS::CloudWatch::Alarm": "file:///etc/heat/templates/AWS_CloudWatch_Alarm.yaml" + #"AWS::CloudWatch::Alarm": "OS::Heat::CWLiteAlarm" "OS::Metering::Alarm": "OS::Ceilometer::Alarm" "AWS::RDS::DBInstance": "file:///etc/heat/templates/AWS_RDS_DBInstance.yaml" diff --git a/etc/heat/heat.conf.sample b/etc/heat/heat.conf.sample index 0807f74c4..5443645c3 100644 --- a/etc/heat/heat.conf.sample +++ b/etc/heat/heat.conf.sample @@ -70,6 +70,10 @@ # stack locking. (integer value) #engine_life_check_timeout=2 +# Enable the legacy OS::Heat::CWLiteAlarm resource. (boolean +# value) +#enable_cloud_watch_lite=true + # Deprecated. (string value) #onready=<None> |