openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Remove workaround for masked redis-server.service"

Browse Source
This commit is contained in:
Zuul 2022-02-08 18:20:17 +00:00 committed by Gerrit Code Review
commit 81c9764b51
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/redis.pp
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 ($::operatingsystem == 'Debian') {
$service_enable = false
} else {
$service_enable = true
}
# NOTE(tobias-urdin): Manually manage redis until arioch/puppet-redis support # NOTE(tobias-urdin): Manually manage redis until arioch/puppet-redis support
# redis 4.x since that is used by Ubuntu Bionic. # redis 4.x since that is used by Ubuntu Bionic.
package { 'redis': package { 'redis':
@ -51,7 +42,7 @@ class openstack_integration::redis {
service { 'redis': service { 'redis':
ensure => 'running', ensure => 'running',
name => $redis_service_name, name => $redis_service_name,
enable => $service_enable, enable => true,
require => File_line['redis_config'], require => File_line['redis_config'],
} }
} }