From d8c452f91a32f74a5fece67049f8a9a17a560697 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sat, 5 Feb 2022 23:28:00 +0900
Subject: [PATCH] Remove workaround for masked redis-server.service

This is revert of 74022b48ddb6312bcc3b82a92b9bc45fdcbf04f1 and its
follow up commit 46b503f7b02f9aabad953776c2d8b4eb02859dda. The logic
was added for Debian but we no longer have Debian jobs.

Change-Id: I7633fbfbf3424f093dac5811e9c2fb8dcdf3167b
---
 manifests/redis.pp | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/manifests/redis.pp b/manifests/redis.pp
index 2d2b53519..3312fca9e 100644
--- a/manifests/redis.pp
+++ b/manifests/redis.pp
@@ -23,15 +23,6 @@ class openstack_integration::redis {
     }
   }
 
-  # due to issues in OpenStack CI with the redis package, we need to disable
-  # the service enable flag. The service still starts but the management of
-  # the service with systemd errors.
-  if ($::operatingsystem == 'Debian') {
-    $service_enable = false
-  } else {
-    $service_enable = true
-  }
-
   # NOTE(tobias-urdin): Manually manage redis until arioch/puppet-redis support
   # redis 4.x since that is used by Ubuntu Bionic.
   package { 'redis':
@@ -51,7 +42,7 @@ class openstack_integration::redis {
   service { 'redis':
     ensure  => 'running',
     name    => $redis_service_name,
-    enable  => $service_enable,
+    enable  => true,
     require => File_line['redis_config'],
   }
 }