summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-08 21:46:34 +0000
committerGerrit Code Review <review@openstack.org>2016-03-08 21:46:34 +0000
commitc0cb85170dbd6f0c812d59d858bfeac9a2bf9de9 (patch)
tree6a0e17c1b4f1149629971c9e06b2d8cc3886422d
parent161e1602e7b393c35cd04d7c86c2b84c0e6bfda7 (diff)
parent03c2316708cb268fb656a29c7882ba096179c1d5 (diff)
Merge "Store events in Ceilometer"
-rw-r--r--puppet/controller.yaml6
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 494347ff..c97012d7 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -32,6 +32,10 @@ parameters:
description: The password for the ceilometer service and db account.
type: string
hidden: true
+ CeilometerStoreEvents:
+ default: false
+ description: Whether to store events in ceilometer.
+ type: boolean
CinderApiVirtualIP:
type: string
default: ''
@@ -1135,6 +1139,7 @@ resources:
ceilometer_backend: {get_param: CeilometerBackend}
ceilometer_metering_secret: {get_param: CeilometerMeteringSecret}
ceilometer_password: {get_param: CeilometerPassword}
+ ceilometer_store_events: {get_param: CeilometerStoreEvents}
ceilometer_coordination_url:
list_join:
- ''
@@ -1526,6 +1531,7 @@ resources:
ceilometer::agent::auth::auth_password: {get_input: ceilometer_password}
ceilometer::agent::auth::auth_url: {get_input: keystone_auth_uri}
ceilometer::agent::central::coordination_url: {get_input: ceilometer_coordination_url}
+ ceilometer::agent::notification::store_events: {get_input: ceilometer_store_events}
ceilometer::db::mysql::password: {get_input: ceilometer_password}
snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name}
snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password}