Merge branch 'mitaka_dev' into 'master'

Mitaka dev

See merge request !37

manifests/params.pp

@@ -77,6 +77,8 @@ $os_nova_passwd 	= 'nova',
 ##Ceilometer
 $os_ceilometer_passwd 	= 'ceilometer',
 $os_ceilometer_secret 	= 'ceilometer',
+$os_ceilometer_ttl_event  = '604800',
+$os_ceilometer_ttl_metering  = '604800',
 
 ##Glance
 $os_glance_passwd 	= 'glance',

manifests/profile/ceilometer/common.pp

@@ -4,6 +4,10 @@ class iaas::profile::ceilometer::common (
   $password = $iaas::params::os_ceilometer_passwd,
   $region = $iaas::params::os_region,
 
+#Time to live
+ $time_to_live_event = $iaas::params::os_ceilometer_ttl_event,
+ $time_to_live_metering = $iaas::params::os_ceilometer_ttl_metering,
+
 #VIP1
   $endpoint_main = $iaas::params::main_address,
 #VIP2
@@ -37,6 +41,9 @@ class iaas::profile::ceilometer::common (
     rabbit_virtual_host => '/',
 #mitaka, memcache
     memcached_servers => suffix($memcache, ':11211'),
+#mitaka, time_to_live
+    event_time_to_live => $time_to_live_event,
+    metering_time_to_live => $time_to_live_metering,
   }
 
   class { '::ceilometer::agent::auth':