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

This reverts commit 02efd7afe0.
This commit is contained in:
Branan Purvine-Riley
2012-07-06 14:43:52 -07:00
parent cfc0730556
commit 12b8159941
2 changed files with 2 additions and 2 deletions

View File

@@ -39,7 +39,7 @@ define swift::storage::server(
$bind_port = $name $bind_port = $name
rsync::server::module { "${type}_${name}": rsync::server::module { "${type}":
path => $devices, path => $devices,
lock_file => "/var/lock/${type}.lock", lock_file => "/var/lock/${type}.lock",
uid => $owner, uid => $owner,

View File

@@ -121,7 +121,7 @@ describe 'swift::storage::server' do
req_params req_params
end end
it { should contain_rsync__server__module("#{t}_8000").with( it { should contain_rsync__server__module("#{t}").with(
:path => '/srv/node', :path => '/srv/node',
:lock_file => "/var/lock/#{t}.lock", :lock_file => "/var/lock/#{t}.lock",
:uid => 'swift', :uid => 'swift',