From d7b4ae25f5f24942dc2faac87347d2e315795d70 Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Thu, 22 May 2014 16:11:35 -0400 Subject: [PATCH 1/3] Remove useless class definition Remove useless class definition (swift::storage::account, swift::storage::container, swift::storage::object) as they are already defined in swift::storage::server. https://github.com/stackforge/puppet-swift/blob/master/manifests/storage/server.pp#L37 --- manifests/object/storage.pp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/manifests/object/storage.pp b/manifests/object/storage.pp index 2d2ae33e..e1426f8e 100644 --- a/manifests/object/storage.pp +++ b/manifests/object/storage.pp @@ -100,12 +100,6 @@ allow_versions = on weight => '100.0', } - class{ - ['swift::storage::object', - 'swift::storage::container', - 'swift::storage::account']: - } - Swift::Ringsync<<| |>> -> Swift::Storage::Server[$container_port] -> Swift::Storage::Server[$account_port] -> From fbd1137105ab47680bfce9de7e04be6d230e3fbc Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Thu, 22 May 2014 16:19:02 -0400 Subject: [PATCH 2/3] Refactor common lines --- manifests/object/storage.pp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/manifests/object/storage.pp b/manifests/object/storage.pp index e1426f8e..04593016 100644 --- a/manifests/object/storage.pp +++ b/manifests/object/storage.pp @@ -73,12 +73,9 @@ allow_versions = on log_facility => 'LOG_LOCAL6', } - swift::storage::filter::recon { 'object': } - swift::storage::filter::recon { 'container': } - swift::storage::filter::recon { 'account': } - swift::storage::filter::healthcheck { 'object': } - swift::storage::filter::healthcheck { 'container': } - swift::storage::filter::healthcheck { 'account': } + $swift_components = ['account', 'container', 'object'] + swift::storage::filter::recon { $swift_components : } + swift::storage::filter::healthcheck { $swift_components : } $object_nodes = flatten([ range('sdc','sdd')]) swift::storage::xfs { $object_nodes: } From f901e1a63031cc36fb9dbacb870f849a4345ecb3 Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Thu, 22 May 2014 16:21:45 -0400 Subject: [PATCH 3/3] Remove ssh::server::install from puppet-openstack-cloud Since ssh::server::install is already installed by the swift module there is no need to have it declared here also. --- manifests/object.pp | 2 -- manifests/object/ringbuilder.pp | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/object.pp b/manifests/object.pp index 84dd7e36..9e0c5340 100644 --- a/manifests/object.pp +++ b/manifests/object.pp @@ -27,8 +27,6 @@ class cloud::object( $swift_hash_suffix = undef ) { - class { 'ssh::server::install': } - class { 'swift': swift_hash_suffix => $swift_hash_suffix, } diff --git a/manifests/object/ringbuilder.pp b/manifests/object/ringbuilder.pp index 4889b978..ddfe72cc 100644 --- a/manifests/object/ringbuilder.pp +++ b/manifests/object/ringbuilder.pp @@ -22,6 +22,8 @@ class cloud::object::ringbuilder( $swift_rsync_max_connections = 5, ) { + include cloud::object + Ring_object_device <<| |>> Ring_container_device <<| |>> Ring_account_device <<| |>>