From ff7c3a9c96d373cc7506aa5cfadd47da2ff07c8b Mon Sep 17 00:00:00 2001
From: Bogdan Dobrelya <bdobreli@redhat.com>
Date: Wed, 8 Dec 2021 17:49:28 +0100
Subject: [PATCH] [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 7debe1a7edc5be42b4ff9f4311e5adbe4f17b07c)
---
 deployment/heat/heat-base-puppet.yaml              | 7 ++++---
 deployment/keystone/keystone-container-puppet.yaml | 9 +++++----
 deployment/nova/nova-base-puppet.yaml              | 7 ++++---
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/deployment/heat/heat-base-puppet.yaml b/deployment/heat/heat-base-puppet.yaml
index 5f754a8764..485d1d85bf 100644
--- a/deployment/heat/heat-base-puppet.yaml
+++ b/deployment/heat/heat-base-puppet.yaml
@@ -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'
diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml
index 0a47f0b780..1a26af5d03 100644
--- a/deployment/keystone/keystone-container-puppet.yaml
+++ b/deployment/keystone/keystone-container-puppet.yaml
@@ -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
diff --git a/deployment/nova/nova-base-puppet.yaml b/deployment/nova/nova-base-puppet.yaml
index f94abdaa1a..2da8e56f3a 100644
--- a/deployment/nova/nova-base-puppet.yaml
+++ b/deployment/nova/nova-base-puppet.yaml
@@ -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
           - {}