Revert "Allow multiple instances of swift::storage::server on one host"

This reverts commit 02efd7afe0.

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,

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',