openstack/puppet-swift
Code Issues Proposed changes

Fix the rsync modules names

Browse Source 
The rsync module name must be only ```$type``` as written in the
documentation [1].

The names with the port added exists but is intended to be used only in
SAIO mode [2] and is only supported if the ```vm_test_mode``` option is
set in ```swift.conf```.

The effect of these shares not being named correctly is seen in the
```swift-{object,account,container}-replicator``` daemons (replication
fails).

[1] http://swift.openstack.org/1.4.6/howto_installmultinode.html#configure-the-storage-nodes
[2] http://swift.openstack.org/1.4.6/development_saio.html
This commit is contained in:
François Charlier
2012-05-22 17:18:41 +02:00
parent 2e671c2afa
commit b394c6df19
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/storage/server.pp
View File

@@ -36,9 +36,9 @@ 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}${name}.lock", lock_file => "/var/lock/${type}.lock",
uid => $owner, uid => $owner,
gid => $group, gid => $group,
max_connections => $max_connections, max_connections => $max_connections,

4
spec/defines/swift_storage_server_spec.rb
View File

@@ -92,9 +92,9 @@ describe 'swift::storage::server' do
req_params req_params
end end
it { should contain_rsync__server__module("#{t}#{title}").with( it { should contain_rsync__server__module("#{t}").with(
:path => '/srv/node', :path => '/srv/node',
:lock_file => "/var/lock/#{t}#{title}.lock", :lock_file => "/var/lock/#{t}.lock",
:uid => 'swift', :uid => 'swift',
:gid => 'swift', :gid => 'swift',
:max_connections => 25, :max_connections => 25,