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

@@ -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',
+    }
   }
 }