openstack
/
puppet-swift
Code Issues Proposed changes

Enable Swift containersync on Red Hat platform 

The systemd service files have been merged (see [1]), thus we can enable
the containersync service now by default without a distribution check.

[1] https://review.rdoproject.org/r/6172/ merged

Change-Id: I6c1f953efe5df32160719ea1de2dd718f281cec0
This commit is contained in:
Christian Schwede 2017-06-16 15:40:12 +02:00
parent 4955428bf0
commit dede1d4494
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
manifests/storage/container.pp
View File

@ -43,6 +43,7 @@ class swift::storage::container(
include ::swift::deps
Swift_config<| |> ~> Service['swift-container-updater']
Swift_config<| |> ~> Service['swift-container-sync']
swift::storage::generic { 'container':
manage_service => $manage_service,
@ -70,16 +71,13 @@ class swift::storage::container(
service_subscribe => Concat["/etc/swift/${config_file_name}"],
}
if $::osfamily == 'Debian' {
swift::service { 'swift-container-sync':
os_family_service_name => $::swift::params::container_sync_service_name,
service_ensure => $service_ensure,
enabled => $enabled,
config_file_name => $config_file_name,
service_provider => $service_provider,
service_require => Package['swift-container'],
service_subscribe => Concat["/etc/swift/${config_file_name}"],
}
Swift_config<| |> ~> Service['swift-container-sync']
swift::service { 'swift-container-sync':
os_family_service_name => $::swift::params::container_sync_service_name,
service_ensure => $service_ensure,
enabled => $enabled,
config_file_name => $config_file_name,
service_provider => $service_provider,
service_require => Package['swift-container'],
service_subscribe => Concat["/etc/swift/${config_file_name}"],
}
}

5
releasenotes/notes/swift-containersync-service-f188d18796e7affe.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
The systemd service for Swift containersync is now enabled by
default without a distribution check.

1
spec/classes/swift_storage_container_spec.rb
View File

@ -142,6 +142,7 @@ describe 'swift::storage::container' do
'swift-container-replicator' => 'swift-container-replicator',
'swift-container-updater' => 'swift-container-updater',
'swift-container-auditor' => 'swift-container-auditor',
'swift-container-sync' => 'swift-container-sync'
},
:service_provider => 'swiftinit'
}