openstack/puppet-ceilometer
Code Issues Proposed changes

Add support for [cache] backend_expiration_time

Browse Source 
Depends-on: https://review.opendev.org/933978
Change-Id: Ie733f700dd815041b5d34666ed4c56515a2a1d30
This commit is contained in:
Takashi Kajinami 2024-11-03 09:18:00 +09:00
parent 86af102f74
commit 84019cd78c
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/cache.pp
View File

@ -18,6 +18,11 @@
# (integer value) # (integer value)
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
# [*backend_expiration_time*]
# (optional) expiration time in cache backend to purge expired records
# automatically.
# defaults to $facts['os_service_default']
#
# [*backend*] # [*backend*]
# (Optional) Dogpile.cache backend module. It is recommended that # (Optional) Dogpile.cache backend module. It is recommended that
# Memcache with pooling (oslo_cache.memcache_pool) or Redis # Memcache with pooling (oslo_cache.memcache_pool) or Redis
@ -215,6 +220,7 @@
class ceilometer::cache ( class ceilometer::cache (
$config_prefix = $facts['os_service_default'], $config_prefix = $facts['os_service_default'],
$expiration_time = $facts['os_service_default'], $expiration_time = $facts['os_service_default'],
$backend_expiration_time = $facts['os_service_default'],
$backend = $facts['os_service_default'], $backend = $facts['os_service_default'],
$backend_argument = $facts['os_service_default'], $backend_argument = $facts['os_service_default'],
$proxies = $facts['os_service_default'], $proxies = $facts['os_service_default'],
@ -259,6 +265,7 @@ class ceilometer::cache (
oslo::cache { 'ceilometer_config': oslo::cache { 'ceilometer_config':
config_prefix => $config_prefix, config_prefix => $config_prefix,
expiration_time => $expiration_time, expiration_time => $expiration_time,
backend_expiration_time => $backend_expiration_time,
backend => $backend, backend => $backend,
backend_argument => $backend_argument, backend_argument => $backend_argument,
proxies => $proxies, proxies => $proxies,

5
releasenotes/notes/cache-backend-expiration-time-9f293679ac6f6d4f.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
The new ``ceilometer::cache::backend_expiration_time`` parameter has been
added.

3
spec/classes/ceilometer_cache_spec.rb
View File

@ -13,6 +13,7 @@ describe 'ceilometer::cache' do
is_expected.to contain_oslo__cache('ceilometer_config').with( is_expected.to contain_oslo__cache('ceilometer_config').with(
:config_prefix => '<SERVICE DEFAULT>', :config_prefix => '<SERVICE DEFAULT>',
:expiration_time => '<SERVICE DEFAULT>', :expiration_time => '<SERVICE DEFAULT>',
:backend_expiration_time => '<SERVICE DEFAULT>',
:backend => '<SERVICE DEFAULT>', :backend => '<SERVICE DEFAULT>',
:backend_argument => '<SERVICE DEFAULT>', :backend_argument => '<SERVICE DEFAULT>',
:proxies => '<SERVICE DEFAULT>', :proxies => '<SERVICE DEFAULT>',
@ -59,6 +60,7 @@ describe 'ceilometer::cache' do
{ {
:config_prefix => 'prefix', :config_prefix => 'prefix',
:expiration_time => 3600, :expiration_time => 3600,
:backend_expiration_time => 7200,
:backend => 'oslo_cache.memcache_pool', :backend => 'oslo_cache.memcache_pool',
:proxies => ['proxy01:8888', 'proxy02:8888'], :proxies => ['proxy01:8888', 'proxy02:8888'],
:enabled => true, :enabled => true,
@ -98,6 +100,7 @@ describe 'ceilometer::cache' do
is_expected.to contain_oslo__cache('ceilometer_config').with( is_expected.to contain_oslo__cache('ceilometer_config').with(
:config_prefix => 'prefix', :config_prefix => 'prefix',
:expiration_time => 3600, :expiration_time => 3600,
:backend_expiration_time => 7200,
:backend => 'oslo_cache.memcache_pool', :backend => 'oslo_cache.memcache_pool',
:backend_argument => '<SERVICE DEFAULT>', :backend_argument => '<SERVICE DEFAULT>',
:proxies => ['proxy01:8888', 'proxy02:8888'], :proxies => ['proxy01:8888', 'proxy02:8888'],