Merge "Enable Swift containersync on Red Hat platform"

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}"],
   }
 }

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.

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'
         }