diff --git a/puppet-manifests/centos/build_srpm.data b/puppet-manifests/centos/build_srpm.data index 6171a4746..8a79ffe0e 100644 --- a/puppet-manifests/centos/build_srpm.data +++ b/puppet-manifests/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="src" -TIS_PATCH_VER=58 +TIS_PATCH_VER=59 diff --git a/puppet-manifests/src/modules/openstack/manifests/ceilometer.pp b/puppet-manifests/src/modules/openstack/manifests/ceilometer.pp index dc16425a2..bff958188 100644 --- a/puppet-manifests/src/modules/openstack/manifests/ceilometer.pp +++ b/puppet-manifests/src/modules/openstack/manifests/ceilometer.pp @@ -37,9 +37,16 @@ class openstack::ceilometer { 'DEFAULT/region_name_for_services': value => $::openstack::ceilometer::params::region_name; } - oslo::cache { 'ceilometer_config': - enabled => true, - backend => 'dogpile.cache.memory', + + if $::personality == 'controller' { + include ::platform::memcached::params + + oslo::cache { 'ceilometer_config': + enabled => true, + backend => 'dogpile.cache.memcached', + memcache_servers => "'${::platform::memcached::params::listen_ip}:${::platform::memcached::params::tcp_port}'", + expiration_time => 86400, + } } if $::platform::params::region_config {