Remove workaround for puppet-redis + CentOS Stream 9

... because puppet-redis supports CentOS Stream 9 since v8.3.0 and
uses the correct file path automatically.

[1] 9d2e3fc5b6

Change-Id: I9d2d78fe98d3a6f820b5356a78f4cf599a6d6d27
This commit is contained in:
Takashi Kajinami 2022-06-24 10:37:48 +09:00
parent d99b4f5ffe
commit f046bf6ee7
1 changed files with 2 additions and 21 deletions

View File

@ -1,27 +1,8 @@
class openstack_integration::redis {
include openstack_integration::config
# TODO(tkajinam): Remove this once puppet-redis supports CentOS 9
case $::osfamily {
'Debian': {
$redis_config = '/etc/redis/redis.conf'
}
'RedHat': {
if versioncmp($::operatingsystemmajrelease, '8') > 0 {
$redis_config = '/etc/redis/redis.conf'
} else {
$redis_config = '/etc/redis.conf'
}
}
default: {
fail("redis.pp manifest does not support family: ${::osfamily}")
}
}
class { 'redis':
bind => $::openstack_integration::config::host,
config_file => $redis_config,
config_file_orig => "${redis_config}.puppet",
ulimit_managed => false,
bind => $::openstack_integration::config::host,
ulimit_managed => false,
}
}