Merge "Fix Redis config generation when fd limit changes" into stable…

…/wallaby
openstack-archive · Apr 29, 2022 · 6f1aed5 · 6f1aed5
2 parents 935261d + 7d5eaa1
commit 6f1aed5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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: