From 12b8159941ede46cd3f948b744917eb9d882a22d Mon Sep 17 00:00:00 2001
From: Branan Purvine-Riley <branan@puppetlabs.com>
Date: Fri, 6 Jul 2012 14:43:52 -0700
Subject: [PATCH] Revert "Allow multiple instances of swift::storage::server on
 one host"

This reverts commit 02efd7afe06f029edee3bfcc6395857e1459b3ec.
---
 manifests/storage/server.pp               | 2 +-
 spec/defines/swift_storage_server_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/storage/server.pp b/manifests/storage/server.pp
index 2035384d..3bbedd9f 100644
--- a/manifests/storage/server.pp
+++ b/manifests/storage/server.pp
@@ -39,7 +39,7 @@ define swift::storage::server(
 
   $bind_port = $name
 
-  rsync::server::module { "${type}_${name}":
+  rsync::server::module { "${type}":
     path => $devices,
     lock_file => "/var/lock/${type}.lock",
     uid => $owner,
diff --git a/spec/defines/swift_storage_server_spec.rb b/spec/defines/swift_storage_server_spec.rb
index 488c2340..f25e280e 100644
--- a/spec/defines/swift_storage_server_spec.rb
+++ b/spec/defines/swift_storage_server_spec.rb
@@ -121,7 +121,7 @@ describe 'swift::storage::server' do
           req_params
         end
 
-        it { should contain_rsync__server__module("#{t}_8000").with(
+        it { should contain_rsync__server__module("#{t}").with(
           :path            => '/srv/node',
           :lock_file       => "/var/lock/#{t}.lock",
           :uid             => 'swift',