summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-14 01:06:28 +0000
committerGerrit Code Review <review@openstack.org>2017-06-14 01:06:28 +0000
commit882ed99b0c02129dee053ed16fa7b42829780b6b (patch)
tree64f77ccb4c54b968d394453e0dd7c13833de3f74
parentb49149206b252675ca15460f7a0cae0bd6b6817d (diff)
parentc2d08c4fda5531be8bb237114de6e283189146bf (diff)
Merge "Expose events ttl for ceilometer" into stable/newton
-rw-r--r--puppet/services/ceilometer-base.yaml5
1 files changed, 5 insertions, 0 deletions
diff --git a/puppet/services/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml
index 77d8e18..2aae909 100644
--- a/puppet/services/ceilometer-base.yaml
+++ b/puppet/services/ceilometer-base.yaml
@@ -44,6 +44,10 @@ parameters:
44 default: false 44 default: false
45 description: Whether to store events in ceilometer. 45 description: Whether to store events in ceilometer.
46 type: boolean 46 type: boolean
47 CeilometerEventsTTL:
48 default: -1
49 description: Number of seconds before database can expire the events data
50 type: number
47 Debug: 51 Debug:
48 default: '' 52 default: ''
49 description: Set to True to enable debugging on all services. 53 description: Set to True to enable debugging on all services.
@@ -91,6 +95,7 @@ outputs:
91 - "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}" 95 - "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
92 ceilometer_backend: {get_param: CeilometerBackend} 96 ceilometer_backend: {get_param: CeilometerBackend}
93 ceilometer::metering_secret: {get_param: CeilometerMeteringSecret} 97 ceilometer::metering_secret: {get_param: CeilometerMeteringSecret}
98 ceilometer::event_time_to_live: {get_param: CeilometerEventsTTL}
94 # we include db_sync class in puppet-tripleo 99 # we include db_sync class in puppet-tripleo
95 ceilometer::db::sync_db: false 100 ceilometer::db::sync_db: false
96 ceilometer::keystone::authtoken::project_name: 'service' 101 ceilometer::keystone::authtoken::project_name: 'service'