summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-16 21:43:14 +0000
committerGerrit Code Review <review@openstack.org>2016-08-16 21:43:14 +0000
commit9115c60dac6bb56028a8ab737ee538bbbf664d44 (patch)
tree89fd5c63bd12d6604525e9f9cd2adda31b284de9 /puppet/services
parente33646ce470940d0b264dfdea7ff4f896a3590ea (diff)
parent0ec58cf5368c722c87cc6b5dcba5fefd77e3e444 (diff)
Merge "Mv Ceilometer settings out of puppet/compute.yaml"
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/ceilometer-base.yaml6
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/services/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml
index 1398fedb..59b4cc2a 100644
--- a/puppet/services/ceilometer-base.yaml
+++ b/puppet/services/ceilometer-base.yaml
@@ -35,6 +35,10 @@ parameters:
default: false
description: Whether to store events in ceilometer.
type: boolean
+ Debug:
+ default: ''
+ description: Set to True to enable debugging on all services.
+ type: string
KeystoneRegion:
type: string
default: 'regionOne'
@@ -64,6 +68,7 @@ outputs:
value:
service_name: ceilometer_base
config_settings:
+ ceilometer::debug: {get_param: Debug}
ceilometer::db::database_connection:
list_join:
- ''
@@ -111,3 +116,4 @@ outputs:
ceilometer::rabbit_heartbeat_timeout_threshold: 60
ceilometer::db::database_db_max_retries: -1
ceilometer::db::database_max_retries: -1
+ ceilometer::telemetry_secret: {get_param: CeilometerMeteringSecret}