Deprecate cache parameters in the base class
in favor of the new ceilometer::cache class. This should have been done
when we added that class.
Conflicts:
manifests/init.pp
Change-Id: Ida080fe2a71d6215a8365cfb4f9f902dfcaaa760
(cherry picked from commit a7cf7060dd)
This commit is contained in:
Takashi Kajinami
Yadnesh Kulkarni
parent
0222693649
commit
c5f962b4bc
|
|
@ -18,7 +18,7 @@
|
|||
# (integer value)
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*backend*]
|
||||
# [*cache_backend*]
|
||||
# (Optional) Dogpile.cache backend module. It is recommended that
|
||||
# Memcache with pooling (oslo_cache.memcache_pool) or Redis
|
||||
# (dogpile.cache.redis) be used in production deployments. (string value)
|
||||
|
|
@ -85,18 +85,18 @@
|
|||
# (Optional) (Optional) Whether to install the backend package for the cache.
|
||||
# Defaults to true
|
||||
#
|
||||
# [*tls_enabled*]
|
||||
# [*cache_tls_enabled*]
|
||||
# (Optional) Global toggle for TLS usage when comunicating with
|
||||
# the caching servers.
|
||||
# Default to $::os_service_default
|
||||
#
|
||||
# [*tls_cafile*]
|
||||
# [*cache_tls_cafile*]
|
||||
# (Optional) Path to a file of concatenated CA certificates in PEM
|
||||
# format necessary to establish the caching server's authenticity.
|
||||
# If tls_enabled is False, this option is ignored.
|
||||
# Default to $::os_service_default
|
||||
#
|
||||
# [*tls_certfile*]
|
||||
# [*cache_tls_certfile*]
|
||||
# (Optional) Path to a single file in PEM format containing the
|
||||
# client's certificate as well as any number of CA certificates
|
||||
# needed to establish the certificate's authenticity. This file
|
||||
|
|
@ -104,14 +104,14 @@
|
|||
# If tls_enabled is False, this option is ignored.
|
||||
# Default to $::os_service_default
|
||||
#
|
||||
# [*tls_keyfile*]
|
||||
# [*cache_tls_keyfile*]
|
||||
# (Optional) Path to a single file containing the client's private
|
||||
# key in. Otherwhise the private key will be taken from the file
|
||||
# specified in tls_certfile. If tls_enabled is False, this option
|
||||
# is ignored.
|
||||
# Default to $::os_service_default
|
||||
#
|
||||
# [*tls_allowed_ciphers*]
|
||||
# [*cache_tls_allowed_ciphers*]
|
||||
# (Optional) Set the available ciphers for sockets created with
|
||||
# the TLS context. It should be a string in the OpenSSL cipher
|
||||
# list format. If not specified, all OpenSSL enabled ciphers will
|
||||
|
|
@ -121,7 +121,7 @@
|
|||
class ceilometer::cache (
|
||||
$config_prefix = $::os_service_default,
|
||||
$expiration_time = $::os_service_default,
|
||||
$backend = $::os_service_default,
|
||||
$cache_backend = $::os_service_default,
|
||||
$backend_argument = $::os_service_default,
|
||||
$proxies = $::os_service_default,
|
||||
$enabled = $::os_service_default,
|
||||
|
|
@ -133,11 +133,11 @@ class ceilometer::cache (
|
|||
$memcache_pool_unused_timeout = $::os_service_default,
|
||||
$memcache_pool_connection_get_timeout = $::os_service_default,
|
||||
$manage_backend_package = true,
|
||||
$tls_enabled = $::os_service_default,
|
||||
$tls_cafile = $::os_service_default,
|
||||
$tls_certfile = $::os_service_default,
|
||||
$tls_keyfile = $::os_service_default,
|
||||
$tls_allowed_ciphers = $::os_service_default,
|
||||
$cache_tls_enabled = $::os_service_default,
|
||||
$cache_tls_cafile = $::os_service_default,
|
||||
$cache_tls_certfile = $::os_service_default,
|
||||
$cache_tls_keyfile = $::os_service_default,
|
||||
$cache_tls_allowed_ciphers = $::os_service_default,
|
||||
) {
|
||||
|
||||
include ceilometer::deps
|
||||
|
|
@ -145,7 +145,7 @@ class ceilometer::cache (
|
|||
oslo::cache { 'ceilometer_config':
|
||||
config_prefix => $config_prefix,
|
||||
expiration_time => $expiration_time,
|
||||
backend => $backend,
|
||||
backend => $cache_backend,
|
||||
backend_argument => $backend_argument,
|
||||
proxies => $proxies,
|
||||
enabled => $enabled,
|
||||
|
|
@ -157,10 +157,10 @@ class ceilometer::cache (
|
|||
memcache_pool_unused_timeout => $memcache_pool_unused_timeout,
|
||||
memcache_pool_connection_get_timeout => $memcache_pool_connection_get_timeout,
|
||||
manage_backend_package => $manage_backend_package,
|
||||
tls_enabled => $tls_enabled,
|
||||
tls_cafile => $tls_cafile,
|
||||
tls_certfile => $tls_certfile,
|
||||
tls_keyfile => $tls_keyfile,
|
||||
tls_allowed_ciphers => $tls_allowed_ciphers,
|
||||
tls_enabled => $cache_tls_enabled,
|
||||
tls_cafile => $cache_tls_cafile,
|
||||
tls_certfile => $cache_tls_certfile,
|
||||
tls_keyfile => $cache_tls_keyfile,
|
||||
tls_allowed_ciphers => $cache_tls_allowed_ciphers,
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -124,14 +124,14 @@ describe 'ceilometer' do
|
|||
|
||||
it 'configures cache backend' do
|
||||
is_expected.to contain_oslo__cache('ceilometer_config').with(
|
||||
:backend => '<SERVICE DEFAULT>',
|
||||
:memcache_servers => '<SERVICE DEFAULT>',
|
||||
:tls_enabled => '<SERVICE DEFAULT>',
|
||||
:tls_cafile => '<SERVICE DEFAULT>',
|
||||
:tls_certfile => '<SERVICE DEFAULT>',
|
||||
:tls_keyfile => '<SERVICE DEFAULT>',
|
||||
:tls_allowed_ciphers => '<SERVICE DEFAULT>',
|
||||
:manage_backend_package => true,
|
||||
:cache_backend => '<SERVICE DEFAULT>',
|
||||
:memcache_servers => '<SERVICE DEFAULT>',
|
||||
:cache_tls_enabled => '<SERVICE DEFAULT>',
|
||||
:cache_tls_cafile => '<SERVICE DEFAULT>',
|
||||
:cache_tls_certfile => '<SERVICE DEFAULT>',
|
||||
:cache_tls_keyfile => '<SERVICE DEFAULT>',
|
||||
:cache_tls_allowed_ciphers => '<SERVICE DEFAULT>',
|
||||
:manage_backend_package => true,
|
||||
)
|
||||
end
|
||||
|
||||
|
|
@ -170,9 +170,9 @@ describe 'ceilometer' do
|
|||
|
||||
it 'configures cache backend' do
|
||||
is_expected.to contain_oslo__cache('ceilometer_config').with(
|
||||
:backend => 'memcache',
|
||||
:cache_backend => 'memcache',
|
||||
:memcache_servers => 'host1:11211,host2:11211',
|
||||
:tls_enabled => true,
|
||||
:cache_tls_enabled => true,
|
||||
:manage_backend_package => false,
|
||||
)
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue