From e93b454d68dd97e9471e3324c751b5436574e1fc Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 5 Feb 2022 23:22:33 +0900 Subject: [PATCH] Redis: Hard-code paths of configuration files In current CentOS 9 Stream, configuration files of redis is placed in /etc/redis. Following that, the puppet-redis module has been updated to use the new path by [1]. This change ensures that the old path is consistently used in both CentOS 8 and CentOS 9 as we require a hard-coded path to start up redis in standalone mode(without pacemaker). The path can be updated later, for example when we drop support for CentOS 8. [1] https://github.com/voxpupuli/puppet-redis/pull/434 Closes-Bug: #1960620 Change-Id: Ibf7c2f8d01ddf73c92d183e51c378a0770002e72 --- deployment/database/redis-container-puppet.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/deployment/database/redis-container-puppet.yaml b/deployment/database/redis-container-puppet.yaml index 684f7f3ed4..f04189afa9 100644 --- a/deployment/database/redis-container-puppet.yaml +++ b/deployment/database/redis-container-puppet.yaml @@ -94,6 +94,13 @@ outputs: map_merge: - {get_attr: [RedisBase, role_data, config_settings]} - redis::daemonize: false + # NOTE(tkajinam): In CentOS9, the file is placed under /etc/redis. + # Redis resource agent can deal with both of + # the old path and the new path, but the command + # line below for standalone redis does not. + # TODO(tkajinam): Remove this when we drop support for CentOS8. + redis::config_file: '/etc/redis.conf' + redis::config_file_orig: '/etc/redis.conf.puppet' tripleo::stunnel::manage_service: false tripleo::stunnel::foreground: 'yes' - tripleo::profile::base::database::redis::tls_proxy_bind_ip: