From c9b51b1a840d40b1c1543059a93d2b729050c2e7 Mon Sep 17 00:00:00 2001
From: Vladimir Kuklin <vkuklin@mirantis.com>
Date: Tue, 14 Oct 2014 15:05:24 +0400
Subject: [PATCH] Do not kill swift replicator services

To move from exec to SysV provider of the service
in previous releases we had to kill swift replicator
service with swift-init kill command.

This is not what we need in 6.0 release as we
are already managing everything with default OS
providers. Moreover, this commit is error-prone
for Ubuntu with upstart provider.

Change-Id: I9ed3a030b4987f919a9f9ec2d9351f0b2c3623b0
Closes-bug: #1381018
---
 deployment/puppet/swift/manifests/storage/generic.pp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/deployment/puppet/swift/manifests/storage/generic.pp b/deployment/puppet/swift/manifests/storage/generic.pp
index 786a35f890..f32a14ce46 100644
--- a/deployment/puppet/swift/manifests/storage/generic.pp
+++ b/deployment/puppet/swift/manifests/storage/generic.pp
@@ -65,9 +65,6 @@ define swift::storage::generic(
     $service_name = "swift-${name}-replicator"
   }
 
-  exec { "swift-init-kill-${name}-replicator" :
-    command => "/usr/bin/swift-init kill ${name}-replicator",
-  }
 
   service { "swift-${name}-replicator":
     name      => $service_name,
@@ -78,6 +75,5 @@ define swift::storage::generic(
   }
 
   Package["swift-${name}"] ~> Service["swift-${name}-replicator"]
-  Exec["swift-init-kill-${name}-replicator"] ~> Service["swift-${name}-replicator"]
 
 }