aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-05-03 21:14:38 +0000
committerGerrit Code Review <review@openstack.org>2017-05-03 21:14:38 +0000
commitcd20bfa2ddccd9b3b4e08b55b17756841ce6e585 (patch)
treeec101e92058645e5a556fd3f207243a741883975 /puppet
parentd63b08db386574db9b2c587db8473aea353c3376 (diff)
parent32fed0cb6234c47a58be417a272dfbd5411aea95 (diff)
Merge "Set reasonable TTL defaults for Ceilometer DB"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/ceilometer-collector.yaml13
1 files changed, 12 insertions, 1 deletions
diff --git a/puppet/services/ceilometer-collector.yaml b/puppet/services/ceilometer-collector.yaml
index dfc844be..111b3e8b 100644
--- a/puppet/services/ceilometer-collector.yaml
+++ b/puppet/services/ceilometer-collector.yaml
@@ -51,7 +51,16 @@ parameters:
type: comma_delimited_list
constraints:
- allowed_values: ['panko', 'gnocchi', 'database']
-
+ CeilometerEventTTL:
+ default: '86400'
+ description: Number of seconds that events are kept in the database for
+ (<= 0 means forever)
+ type: string
+ CeilometerMeteringTTL:
+ default: '86400'
+ description: Number of seconds that samples are kept in the database for
+ (<= 0 means forever)
+ type: string
resources:
CeilometerServiceBase:
type: ./ceilometer-base.yaml
@@ -91,6 +100,8 @@ outputs:
- '/ceilometer'
- '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
ceilometer_backend: {get_param: CeilometerBackend}
+ ceilometer::event_time_to_live: {get_param: CeilometerEventTTL}
+ ceilometer::metering_time_to_live: {get_param: CeilometerMeteringTTL}
# we include db_sync class in puppet-tripleo
ceilometer::db::sync_db: false
ceilometer::db::database_db_max_retries: -1