Merge pull request #48 from derekhiggins/devel

Starting the swift replicator with /usr/bin/swift-init

manifests/storage/generic.pp

@@ -51,13 +51,24 @@ define swift::storage::generic(
     subscribe => Package["swift-${name}"],
   }
 
-  service { "swift-${name}-replicator":
-    name      => inline_template("<%= scope.lookupvar('::swift::params::${name}_replicator_service_name') %>"),
-    ensure    => running,
-    enable    => true,
-    hasstatus => true,
-    provider  => $service_provider,
-    subscribe => Package["swift-${name}"],
+  if $::osfamily == "RedHat" {
+    service { "swift-${name}-replicator":
+      start    => "/usr/bin/swift-init ${name}-replicator start",
+      ensure    => running,
+      enable    => true,
+      hasstatus => true,
+      provider  => base,
+      subscribe => Package["swift-${name}"],
+    }
+  }else{
+    service { "swift-${name}-replicator":
+      name      => inline_template("<%= scope.lookupvar('::swift::params::${name}_replicator_service_name') %>"),
+      ensure    => running,
+      enable    => true,
+      hasstatus => true,
+      provider  => $service_provider,
+      subscribe => Package["swift-${name}"],
+    }
   }
 
 }

spec/defines/swift_storage_generic_spec.rb

@@ -55,6 +55,12 @@ describe 'swift::storage::generic' do
           :hasstatus => true,
           :provider  => param_hash[:service_provider]
         )}
+        it { should contain_service("swift-#{t}-replicator").with(
+          :ensure    => 'running',
+          :enable    => true,
+          :hasstatus => true,
+          :provider  => param_hash[:service_provider]
+        )}
         it { should contain_file("/etc/swift/#{t}-server/").with(
           :ensure => 'directory',
           :owner  => 'swift',