openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Use dogpile.cache.memcached in nova caching"

This commit is contained in:
Zuul 2020-03-30 22:51:59 +00:00 committed by Gerrit Code Review
parent 87f46ccff0 8d4ea840bf
commit c8d8f860a6
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/profile/base/nova.pp
View File

@ -82,7 +82,11 @@
# (Optional) Enable the use of cache. Note that it is unsupported # (Optional) Enable the use of cache. Note that it is unsupported
# to disable this key. It is only useful for debugging purposes. # to disable this key. It is only useful for debugging purposes.
# Defaults to true # Defaults to true
#
# [*cache_backend*]
# (Optional) Backend implementation to store cache
# Defaults to 'dogpile.cache.memcached'
#
class tripleo::profile::base::nova ( class tripleo::profile::base::nova (
$bootstrap_node = hiera('nova_api_short_bootstrap_node_name', undef), $bootstrap_node = hiera('nova_api_short_bootstrap_node_name', undef),
$oslomsg_rpc_proto = hiera('oslo_messaging_rpc_scheme', 'rabbit'), $oslomsg_rpc_proto = hiera('oslo_messaging_rpc_scheme', 'rabbit'),
@ -100,6 +104,7 @@ class tripleo::profile::base::nova (
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips'), $memcached_ips = hiera('memcached_node_ips'),
$enable_cache = true, $enable_cache = true,
$cache_backend = 'dogpile.cache.memcached',
) { ) {
if $::hostname == downcase($bootstrap_node) { if $::hostname == downcase($bootstrap_node) {
@ -126,7 +131,7 @@ class tripleo::profile::base::nova (
include nova::logging include nova::logging
class { 'nova::cache': class { 'nova::cache':
enabled => $enable_cache, enabled => $enable_cache,
backend => 'oslo_cache.memcache_pool', backend => $cache_backend,
memcache_servers => $memcache_servers, memcache_servers => $memcache_servers,
} }
class { 'nova': class { 'nova':

2
spec/classes/tripleo_profile_base_nova_spec.rb
View File

@ -55,7 +55,7 @@ describe 'tripleo::profile::base::nova' do
is_expected.to contain_class('nova::logging') is_expected.to contain_class('nova::logging')
is_expected.to contain_class('nova::cache').with( is_expected.to contain_class('nova::cache').with(
:enabled => true, :enabled => true,
:backend => 'oslo_cache.memcache_pool', :backend => 'dogpile.cache.memcached',
:memcache_servers => ['127.0.0.1:11211'] :memcache_servers => ['127.0.0.1:11211']
) )
is_expected.to contain_class('nova::placement') is_expected.to contain_class('nova::placement')