diff --git a/deployment/puppet/swift/manifests/storage/generic.pp b/deployment/puppet/swift/manifests/storage/generic.pp index ace0b2c5cc..9f97b036f7 100644 --- a/deployment/puppet/swift/manifests/storage/generic.pp +++ b/deployment/puppet/swift/manifests/storage/generic.pp @@ -33,7 +33,7 @@ define swift::storage::generic( # sorry its so ugly :( name => inline_template("<%= scope.lookupvar('::swift::params::${name}_package_name') %>"), ensure => $package_ensure, - before => Service["swift-${name}"], + before => Service["swift-${name}", "swift-${name}-replicator"], } file { "/etc/swift/${name}-server/": diff --git a/deployment/puppet/swift/manifests/storage/node.pp b/deployment/puppet/swift/manifests/storage/node.pp index 90df96e2f7..0a5d57b798 100644 --- a/deployment/puppet/swift/manifests/storage/node.pp +++ b/deployment/puppet/swift/manifests/storage/node.pp @@ -26,27 +26,24 @@ define swift::storage::node( swift::storage::server { "60${name}0": type => 'object', } - ring_object_device { "${storage_local_net_ip}:60${name}0": + ring_object_device { "${storage_local_net_ip}:60${name}0/$name": zone => $zone, - device_name => $name, weight => $weight, } swift::storage::server { "60${name}1": type => 'container', } - ring_container_device { "${storage_local_net_ip}:60${name}1": + ring_container_device { "${storage_local_net_ip}:60${name}1/$name": zone => $zone, - device_name => $name, weight => $weight, } swift::storage::server { "60${name}2": type => 'account', } - ring_account_device { "${storage_local_net_ip}:60${name}2": + ring_account_device { "${storage_local_net_ip}:60${name}2/$name": zone => $zone, - device_name => $name, weight => $weight, } diff --git a/deployment/puppet/swift/manifests/storage/server.pp b/deployment/puppet/swift/manifests/storage/server.pp index 38d69f16df..2035384d70 100644 --- a/deployment/puppet/swift/manifests/storage/server.pp +++ b/deployment/puppet/swift/manifests/storage/server.pp @@ -39,7 +39,7 @@ define swift::storage::server( $bind_port = $name - rsync::server::module { "${type}": + rsync::server::module { "${type}_${name}": path => $devices, lock_file => "/var/lock/${type}.lock", uid => $owner, @@ -51,7 +51,7 @@ define swift::storage::server( concat { "/etc/swift/${config_file_path}": owner => $owner, group => $group, - notify => Service["swift-${type}"], + notify => Service["swift-${type}", "swift-${type}-replicator"], mode => 640, } diff --git a/deployment/puppet/swift/spec/defines/swift_storage_server_spec.rb b/deployment/puppet/swift/spec/defines/swift_storage_server_spec.rb index f25e280ec1..488c23404d 100644 --- a/deployment/puppet/swift/spec/defines/swift_storage_server_spec.rb +++ b/deployment/puppet/swift/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}").with( + it { should contain_rsync__server__module("#{t}_8000").with( :path => '/srv/node', :lock_file => "/var/lock/#{t}.lock", :uid => 'swift',