From 77c17c7d3fc775eab72d51cf387e3d4804410791 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Fri, 5 Apr 2013 14:48:03 -0400
Subject: [PATCH] RHEL/Fedora replicator updates.

The latest RHEL and Fedora Swift packages now include replicator
init scripts.

This updates the swift module to make use of them.

Change-Id: I6d33aa87ebfda390903762e5a3ab45708db27a5e
---
 manifests/params.pp          |  6 +++---
 manifests/storage/generic.pp | 25 +++++++------------------
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index dad9437a..e7ad8952 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -28,13 +28,13 @@ class swift::params {
       $proxy_service_name                = 'openstack-swift-proxy'
       $object_package_name               = 'openstack-swift-object'
       $object_service_name               = 'openstack-swift-object'
-      $object_replicator_service_name    = undef
+      $object_replicator_service_name    = 'openstack-swift-object-replicator'
       $container_package_name            = 'openstack-swift-container'
       $container_service_name            = 'openstack-swift-container'
-      $container_replicator_service_name = undef
+      $container_replicator_service_name = 'openstack-swift-container-replicator'
       $account_package_name              = 'openstack-swift-account'
       $account_service_name              = 'openstack-swift-account'
-      $account_replicator_service_name   = undef
+      $account_replicator_service_name   = 'openstack-swift-account-replicator'
       $service_provider                  = undef
       $swift3                            = 'openstack-swift-plugin-swift3'
     }
diff --git a/manifests/storage/generic.pp b/manifests/storage/generic.pp
index e6ba17b7..9f97b036 100644
--- a/manifests/storage/generic.pp
+++ b/manifests/storage/generic.pp
@@ -51,24 +51,13 @@ define swift::storage::generic(
     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}"],
-    }
+  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}"],
   }
 
 }