Define nova::cache parameters in tht
Migrate parameter definitions for nova::cache module from puppet-tripleo to tht, so that we can be less dependent on puppet to set configurable items. Note1: The dependent change change is not backported because nova::cache parameters were introduced into tht bt the different change. b277ccf6bbe27d9502a289848731d77f33477776 Note2: This change includes the subsequent change[1] which fixed the broken unite test case. [1]10bb8f9eeb
Change-Id: I796196f7a6e0f1235ac269a55e64161613018b1d (cherry picked from commitbaf5ab640e
)
This commit is contained in:
parent
8d3ea85a36
commit
9f2b7febdd
|
@ -82,15 +82,6 @@
|
|||
# (Optional) Memcached port to use.
|
||||
# Defaults to hiera('memcached_port', 11211)
|
||||
#
|
||||
# [*enable_cache*]
|
||||
# (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'),
|
||||
|
@ -106,10 +97,8 @@ class tripleo::profile::base::nova (
|
|||
$oslomsg_notify_username = hiera('oslo_messaging_notify_user_name', 'guest'),
|
||||
$oslomsg_notify_use_ssl = hiera('oslo_messaging_notify_use_ssl', '0'),
|
||||
$step = Integer(hiera('step')),
|
||||
$memcached_ips = hiera('memcached_node_ips', []),
|
||||
$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) {
|
||||
|
@ -135,8 +124,6 @@ class tripleo::profile::base::nova (
|
|||
include ::nova::config
|
||||
include ::nova::logging
|
||||
class { '::nova::cache':
|
||||
enabled => $enable_cache,
|
||||
backend => $cache_backend,
|
||||
memcache_servers => $memcache_servers,
|
||||
}
|
||||
class { '::nova':
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
---
|
||||
deprecations:
|
||||
- |
|
||||
The ``enable_cache`` and ``cache_backend`` in
|
||||
``tripleo::profile::base::nova`` class were removed because now these
|
||||
parameters are defined in tripleo-heat-templates.
|
|
@ -54,8 +54,6 @@ describe 'tripleo::profile::base::nova' do
|
|||
is_expected.to contain_class('nova::config')
|
||||
is_expected.to contain_class('nova::logging')
|
||||
is_expected.to contain_class('nova::cache').with(
|
||||
:enabled => true,
|
||||
:backend => 'dogpile.cache.memcached',
|
||||
:memcache_servers => ['127.0.0.1:11211']
|
||||
)
|
||||
is_expected.to contain_class('nova::placement')
|
||||
|
|
Loading…
Reference in New Issue