From f046bf6ee70fb58acf9496ab2d293ba16335990c Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Fri, 24 Jun 2022 10:37:48 +0900
Subject: [PATCH] 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] https://github.com/voxpupuli/puppet-redis/commit/9d2e3fc5b67c7246f7f575bcd66f2d6f3726ac7d

Change-Id: I9d2d78fe98d3a6f820b5356a78f4cf599a6d6d27
---
 manifests/redis.pp | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/manifests/redis.pp b/manifests/redis.pp
index 4b8168450..941ccf16a 100644
--- a/manifests/redis.pp
+++ b/manifests/redis.pp
@@ -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,
   }
 }