openstack
/
fuel-library
Code Issues Proposed changes

Merge pull request #35 from branan/fix_all_example 

Fix all example
This commit is contained in:
Dan Bode 2012-06-14 17:28:20 -07:00
parent e06d888a18 8a72a06999
commit fa96238977
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/swift/manifests/storage/generic.pp
View File

@ -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/":

9
deployment/puppet/swift/manifests/storage/node.pp
View File

@ -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,
}

4
deployment/puppet/swift/manifests/storage/server.pp
View File

@ -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,
}

2
deployment/puppet/swift/spec/defines/swift_storage_server_spec.rb
View File

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