From af129f0a93009293dba610ee487a41fb15027336 Mon Sep 17 00:00:00 2001
From: cbaesema <cbaeseman@gmail.com>
Date: Tue, 17 Dec 2013 13:42:38 -0600
Subject: [PATCH] Allow running of proxy and storage on the same node.

This adds conditionals to support a installation
in which a user desires to run both swift proxy and
storage on the same node.

Change-Id: I0cc827525968a9d1dc836c553a39f0ac13c4667e
---
 manifests/storage.pp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/manifests/storage.pp b/manifests/storage.pp
index 27257659..cfc4d1c2 100644
--- a/manifests/storage.pp
+++ b/manifests/storage.pp
@@ -23,9 +23,11 @@ class swift::storage(
   $storage_local_net_ip
 ) {
 
-  class{ 'rsync::server':
-    use_xinetd => true,
-    address    => $storage_local_net_ip,
-    use_chroot => 'no',
+  if !defined(Class['rsync::server']){
+    class{ 'rsync::server':
+      use_xinetd => true,
+      address    => $storage_local_net_ip,
+      use_chroot => 'no',
+    }
   }
 }