stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #475 from enovance/clean_swift_manifests

Browse Source 
Clean swift manifests
This commit is contained in:
Emilien Macchi
2014-05-22 22:54:36 +02:00
parent f999265092 f901e1a630
commit b7203bbaef
3 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/object.pp
View File

@@ -27,8 +27,6 @@ class cloud::object(
$swift_hash_suffix = undef $swift_hash_suffix = undef
) { ) {
class { 'ssh::server::install': }
class { 'swift': class { 'swift':
swift_hash_suffix => $swift_hash_suffix, swift_hash_suffix => $swift_hash_suffix,
} }

2
manifests/object/ringbuilder.pp
View File

@@ -22,6 +22,8 @@ class cloud::object::ringbuilder(
$swift_rsync_max_connections = 5, $swift_rsync_max_connections = 5,
) { ) {
include cloud::object
Ring_object_device <<| |>> Ring_object_device <<| |>>
Ring_container_device <<| |>> Ring_container_device <<| |>>
Ring_account_device <<| |>> Ring_account_device <<| |>>

15
manifests/object/storage.pp
View File

@@ -73,12 +73,9 @@ allow_versions = on
log_facility => 'LOG_LOCAL6', log_facility => 'LOG_LOCAL6',
} }
swift::storage::filter::recon { 'object': } $swift_components = ['account', 'container', 'object']
swift::storage::filter::recon { 'container': } swift::storage::filter::recon { $swift_components : }
swift::storage::filter::recon { 'account': } swift::storage::filter::healthcheck { $swift_components : }
swift::storage::filter::healthcheck { 'object': }
swift::storage::filter::healthcheck { 'container': }
swift::storage::filter::healthcheck { 'account': }
$object_nodes = flatten([ range('sdc','sdd')]) $object_nodes = flatten([ range('sdc','sdd')])
swift::storage::xfs { $object_nodes: } swift::storage::xfs { $object_nodes: }
@@ -100,12 +97,6 @@ allow_versions = on
weight => '100.0', weight => '100.0',
} }
class{
['swift::storage::object',
'swift::storage::container',
'swift::storage::account']:
}
Swift::Ringsync<<| |>> -> Swift::Ringsync<<| |>> ->
Swift::Storage::Server[$container_port] -> Swift::Storage::Server[$container_port] ->
Swift::Storage::Server[$account_port] -> Swift::Storage::Server[$account_port] ->