From dede1d449473f99c4f929e555a3b65b974ebad4b Mon Sep 17 00:00:00 2001
From: Christian Schwede <cschwede@redhat.com>
Date: Fri, 16 Jun 2017 15:40:12 +0200
Subject: [PATCH] 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
---
manifests/storage/container.pp | 20 +++++++++----------
...ontainersync-service-f188d18796e7affe.yaml | 5 +++++
spec/classes/swift_storage_container_spec.rb | 1 +
3 files changed, 15 insertions(+), 11 deletions(-)
create mode 100644 releasenotes/notes/swift-containersync-service-f188d18796e7affe.yaml
diff --git a/manifests/storage/container.pp b/manifests/storage/container.pp
index e3e02e72..8a515b84 100644
--- a/manifests/storage/container.pp
+++ b/manifests/storage/container.pp
@@ -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}"],
}
}
diff --git a/releasenotes/notes/swift-containersync-service-f188d18796e7affe.yaml b/releasenotes/notes/swift-containersync-service-f188d18796e7affe.yaml
new file mode 100644
index 00000000..fd4ba2f8
--- /dev/null
+++ b/releasenotes/notes/swift-containersync-service-f188d18796e7affe.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+ - |
+ The systemd service for Swift containersync is now enabled by
+ default without a distribution check.
diff --git a/spec/classes/swift_storage_container_spec.rb b/spec/classes/swift_storage_container_spec.rb
index 9d6840a4..3c087a9d 100644
--- a/spec/classes/swift_storage_container_spec.rb
+++ b/spec/classes/swift_storage_container_spec.rb
@@ -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'
}