diff --git a/manifests/storage/server.pp b/manifests/storage/server.pp index 1f32ba0b..4961ee0d 100644 --- a/manifests/storage/server.pp +++ b/manifests/storage/server.pp @@ -64,7 +64,7 @@ define swift::storage::server( inline_template( "<%= (pipeline - ['${type}-server']).collect do |x| - 'Swift::Storage::Filter::' + x + '[${type}]' + 'Swift::Storage::Filter::' + x.capitalize + '[${type}]' end.join(',') %>"), ',') diff --git a/spec/defines/swift_storage_server_spec.rb b/spec/defines/swift_storage_server_spec.rb index 7050c5ac..fd78ef60 100644 --- a/spec/defines/swift_storage_server_spec.rb +++ b/spec/defines/swift_storage_server_spec.rb @@ -79,10 +79,10 @@ describe 'swift::storage::server' do end end describe "when pipeline is passed an array" do - let :params do req_params.merge({:pipeline => [1,2,3]}) end + let :params do req_params.merge({:pipeline => ['healthcheck','recon','test']}) end it { should contain_concat__fragment("swift-#{t}-#{title}").with( - :content => /^pipeline\s*=\s*1 2 3\s*$/, - :before => ["Swift::Storage::Filter::1[#{t}]", "Swift::Storage::Filter::2[#{t}]", "Swift::Storage::Filter::3[#{t}]"] + :content => /^pipeline\s*=\s*healthcheck recon test\s*$/, + :before => ["Swift::Storage::Filter::Healthcheck[#{t}]", "Swift::Storage::Filter::Recon[#{t}]", "Swift::Storage::Filter::Test[#{t}]"] )} end describe "when pipeline is not passed an array" do