diff --git a/manifests/profile/base/nova.pp b/manifests/profile/base/nova.pp index 7be9b96d8..859d9c459 100644 --- a/manifests/profile/base/nova.pp +++ b/manifests/profile/base/nova.pp @@ -86,7 +86,11 @@ # (Optional) Enable the use of cache. Note that it is unsupported # to disable this key. It is only useful for debugging purposes. # Defaults to true - +# +# [*cache_backend*] +# (Optional) Backend implementation to store cache +# Defaults to 'dogpile.cache.memcached' +# class tripleo::profile::base::nova ( $bootstrap_node = hiera('nova_api_short_bootstrap_node_name', undef), $oslomsg_rpc_proto = hiera('oslo_messaging_rpc_scheme', 'rabbit'), @@ -105,6 +109,7 @@ class tripleo::profile::base::nova ( $memcached_ips = hiera('memcached_node_ips', []), $memcached_port = hiera('memcached_port', 11211), $enable_cache = true, + $cache_backend = 'dogpile.cache.memcached', ) { if $bootstrap_node and $::hostname == downcase($bootstrap_node) { @@ -131,7 +136,7 @@ class tripleo::profile::base::nova ( include ::nova::logging class { '::nova::cache': enabled => $enable_cache, - backend => 'oslo_cache.memcache_pool', + backend => $cache_backend, memcache_servers => $memcache_servers, } class { '::nova': diff --git a/spec/classes/tripleo_profile_base_nova_spec.rb b/spec/classes/tripleo_profile_base_nova_spec.rb index 8ee04a102..9161490c8 100644 --- a/spec/classes/tripleo_profile_base_nova_spec.rb +++ b/spec/classes/tripleo_profile_base_nova_spec.rb @@ -55,7 +55,7 @@ describe 'tripleo::profile::base::nova' do is_expected.to contain_class('nova::logging') is_expected.to contain_class('nova::cache').with( :enabled => true, - :backend => 'oslo_cache.memcache_pool', + :backend => 'dogpile.cache.memcached', :memcache_servers => ['127.0.0.1:11211'] ) is_expected.to contain_class('nova::placement')