Merge "Set reasonable TTL defaults for Ceilometer DB"

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