Remove workaround for masked redis-server.service

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

Conflicts:
	manifests/redis.pp

Change-Id: I7633fbfbf3424f093dac5811e9c2fb8dcdf3167b
(cherry picked from commit d8c452f91a)
This commit is contained in:
Takashi Kajinami 2022-02-05 23:28:00 +09:00
parent 04889dd7aa
commit 2e77d070e0
1 changed files with 1 additions and 10 deletions

View File

@ -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 ($::os_package_type == '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'],
}
}