[Ussuri-Only] Fix hiera condition for cache_backend

There is a condition misplaced in hiera config for cache_backend.
That set the caching backend to dogpile.cache.null.

In the master/wallaby, the hiera's cache_backend misconfig had been fixed by
https://review.opendev.org/q/topic:simplify_tht
We cannot backport that for T,U and V, so let's provide only related fixes
there.

Change-Id: Ia595d1e636c8d74dd811f240626363481a1a741c
Related: rhbz#1981915
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
(cherry picked from commit 7debe1a7ed)
This commit is contained in:
Bogdan Dobrelya 2021-12-08 17:49:28 +01:00
parent 2c7c0c5522
commit ff7c3a9c96
3 changed files with 13 additions and 10 deletions

View File

@ -211,7 +211,8 @@ outputs:
heat::cache::enabled: {get_param: EnableCache}
heat::cache::tls_enabled: {get_param: MemcachedTLS}
heat::cache::resource_finder_caching: false
if:
heat::cache::backend:
if:
- tls_cache_enabled
- heat::cache::backend: 'dogpile.cache.pymemcache'
- heat::cache::backend: 'dogpile.cache.memcached'
- 'dogpile.cache.pymemcache'
- 'dogpile.cache.memcached'

View File

@ -507,10 +507,11 @@ outputs:
-
keystone::cache::enabled: {get_param: EnableCache}
keystone::cache::tls_enabled: {get_param: MemcachedTLS}
if:
- tls_cache_enabled
- keystone::cache::backend: 'dogpile.cache.pymemcache'
- keystone::cache::backend: 'dogpile.cache.memcached'
keystone::cache_backend:
if:
- tls_cache_enabled
- 'dogpile.cache.pymemcache'
- 'dogpile.cache.memcached'
-
if:
- keystone_federation_enabled

View File

@ -357,10 +357,11 @@ outputs:
- get_attr: [RoleParametersValue, value]
- nova::cache::enabled: {get_param: EnableCache}
nova::cache::tls_enabled: {get_param: MemcachedTLS}
if:
nova::cache::backend:
if:
- tls_cache_enabled
- nova::cache::backend: 'dogpile.cache.pymemcache'
- nova::cache::backend: 'dogpile.cache.memcached'
- 'dogpile.cache.pymemcache'
- 'dogpile.cache.memcached'
- if:
- compute_upgrade_level_empty
- {}