From cea6b846dcbb73f8ae159bbd659196ab9f87bfe1 Mon Sep 17 00:00:00 2001
From: Dan Bode <dan@puppetlabs.com>
Date: Fri, 27 Jan 2012 22:02:50 -0800
Subject: [PATCH] Remove Rsync::Server::Module defaults

This commit consolidates resource defaults into
the resource declaration.
---
 manifests/storage/device.pp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/manifests/storage/device.pp b/manifests/storage/device.pp
index 0680d01a..d0ed32a0 100644
--- a/manifests/storage/device.pp
+++ b/manifests/storage/device.pp
@@ -23,18 +23,15 @@ define swift::storage::device(
 
   $bind_port = $name
 
-  Rsync::Server::Module {
+  rsync::server::module { "${type}${name}":
+    path => $devices,
+    lock_file => "/var/lock/${type}${name}.lock",
     uid => $owner,
     gid => $group,
     max_connections => $max_connections,
     read_only => false,
   }
 
-  rsync::server::module { "${type}${name}":
-    path => $devices,
-    lock_file => "/var/lock/${type}${name}.lock"
-  }
-
   file { "/etc/swift/${type}-server/${name}.conf":
     content => template("swift/${type}-server.conf.erb"),
     owner   => $owner,