From 7d5eaa17c83045a04faf43f5955348bbbefad3d1 Mon Sep 17 00:00:00 2001
From: Damien Ciabrini <dciabrin@redhat.com>
Date: Wed, 9 Feb 2022 16:51:28 +0100
Subject: [PATCH] Fix Redis config generation when fd limit changes

puppet-redis supports [1,2] changing PAM limits for the
file descriptors consumed by Redis. However puppet fails
to run systemd reload inside container-puppet-redis.

We have to keep Exec resources (for old pcs setup and for
manipulating the Redis config file), so silent the Exec
resource in that call systemd reload.

Closes-Bug: #1960134

[1] https://github.com/voxpupuli/puppet-redis/issues/130
[2] https://github.com/voxpupuli/puppet-redis/pull/192

Change-Id: If3569c08edb4e820a4db11ac755f23de71059a10
(cherry picked from commit 85ccef292398641c33f5133442829cb62fa26812)
---
 deployment/database/redis-container-puppet.yaml | 3 ++-
 deployment/database/redis-pacemaker-puppet.yaml | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/deployment/database/redis-container-puppet.yaml b/deployment/database/redis-container-puppet.yaml
index b35e6581f6..a5b86c99eb 100644
--- a/deployment/database/redis-container-puppet.yaml
+++ b/deployment/database/redis-container-puppet.yaml
@@ -108,7 +108,8 @@ outputs:
         step_config:
           list_join:
             - "\n"
-            - - include tripleo::profile::base::database::redis
+            - - Exec <| title == 'systemd-reload-redis' |> { unless => 'true' }
+              - include tripleo::profile::base::database::redis
               - {get_attr: [RedisBase, role_data, step_config]}
         config_image: {get_param: ContainerRedisConfigImage}
       kolla_config:
diff --git a/deployment/database/redis-pacemaker-puppet.yaml b/deployment/database/redis-pacemaker-puppet.yaml
index df468127d0..11b7745ada 100644
--- a/deployment/database/redis-pacemaker-puppet.yaml
+++ b/deployment/database/redis-pacemaker-puppet.yaml
@@ -179,6 +179,7 @@ outputs:
         # https://github.com/arioch/puppet-redis/commit/1c004143223e660cbd433422ff8194508aab9763
         puppet_tags: 'exec'
         step_config: |
+          Exec <| title == 'systemd-reload-redis' |> { unless => 'true' }
           include tripleo::profile::pacemaker::database::redis_bundle
         config_image: &redis_config_image {get_param: ContainerRedisConfigImage}
       kolla_config: