openstack/puppet-swift
Code Issues Proposed changes

Merge "Stop calling ::concat::setup"

Browse Source
This commit is contained in:
Jenkins
2016-01-05 01:31:48 +00:00
committed by Gerrit Code Review
parent 24b4b89ab0 b73516aff6
commit 964ec99060
21 changed files with 20 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/storage/server.pp
View File

@@ -160,8 +160,6 @@ define swift::storage::server(
include "::swift::storage::${type}"
include ::concat::setup
validate_re($name, '^\d+$')
validate_re($type, '^object|container|account$')
validate_array($pipeline)

3
spec/classes/swift_proxy_account_quotas_spec.rb
View File

@@ -27,8 +27,7 @@ describe 'swift::proxy::account_quotas' do
end
let :pre_condition do
'class { "concat::setup": }
concat { "/etc/swift/proxy-server.conf": }'
'concat { "/etc/swift/proxy-server.conf": }'
end
let :fragment_file do

5
spec/classes/swift_proxy_authtoken_spec.rb
View File

@@ -7,10 +7,7 @@ describe 'swift::proxy::authtoken' do
end
let :pre_condition do
'
include concat::setup
concat { "/etc/swift/proxy-server.conf": }
'
'concat { "/etc/swift/proxy-server.conf": }'
end
describe 'when using the default signing directory' do

3
spec/classes/swift_proxy_bulk_spec.rb
View File

@@ -27,8 +27,7 @@ describe 'swift::proxy::bulk' do
end
let :pre_condition do
'class { "concat::setup": }
concat { "/etc/swift/proxy-server.conf": }'
'concat { "/etc/swift/proxy-server.conf": }'
end
let :fragment_file do

3
spec/classes/swift_proxy_cache_spec.rb
View File

@@ -11,8 +11,7 @@ describe 'swift::proxy::cache' do
end
let :pre_condition do
'class { "concat::setup": }
concat { "/etc/swift/proxy-server.conf": }
'concat { "/etc/swift/proxy-server.conf": }
class { "memcached": max_memory => 1 }'
end

3
spec/classes/swift_proxy_catch_errors_spec.rb
View File

@@ -7,8 +7,7 @@ describe 'swift::proxy::catch_errors' do
end
let :pre_condition do
'class { "concat::setup": }
concat { "/etc/swift/proxy-server.conf": }'
'concat { "/etc/swift/proxy-server.conf": }'
end
let :fragment_file do

3
spec/classes/swift_proxy_ceilometer_spec.rb
View File

@@ -9,8 +9,7 @@ describe 'swift::proxy::ceilometer' do
end
let :pre_condition do
'class { "concat::setup": }
concat { "/etc/swift/proxy-server.conf": }
'concat { "/etc/swift/proxy-server.conf": }
class { "swift":
swift_hash_suffix => "dummy"
}'

3
spec/classes/swift_proxy_container_quotas_spec.rb
View File

@@ -27,8 +27,7 @@ describe 'swift::proxy::container_quotas' do
end
let :pre_condition do
'class { "concat::setup": }
concat { "/etc/swift/proxy-server.conf": }'
'concat { "/etc/swift/proxy-server.conf": }'
end
let :fragment_file do

3
spec/classes/swift_proxy_crossdomain_spec.rb
View File

@@ -7,8 +7,7 @@ describe 'swift::proxy::crossdomain' do
end
let :pre_condition do
'class { "concat::setup": }
concat { "/etc/swift/proxy-server.conf": }'
'concat { "/etc/swift/proxy-server.conf": }'
end
let :fragment_file do

3
spec/classes/swift_proxy_formpost_spec.rb
View File

@@ -7,8 +7,7 @@ describe 'swift::proxy::formpost' do
end
let :pre_condition do
'class { "concat::setup": }
concat { "/etc/swift/proxy-server.conf": }'
'concat { "/etc/swift/proxy-server.conf": }'
end
let :fragment_file do

3
spec/classes/swift_proxy_gatekeeper_spec.rb
View File

@@ -7,8 +7,7 @@ describe 'swift::proxy::gatekeeper' do
end
let :pre_condition do
'class { "concat::setup": }
concat { "/etc/swift/proxy-server.conf": }'
'concat { "/etc/swift/proxy-server.conf": }'
end
let :fragment_file do

3
spec/classes/swift_proxy_healthcheck_spec.rb
View File

@@ -7,8 +7,7 @@ describe 'swift::proxy::healthcheck' do
end
let :pre_condition do
'class { "concat::setup": }
concat { "/etc/swift/proxy-server.conf": }'
'concat { "/etc/swift/proxy-server.conf": }'
end
let :fragment_file do

5
spec/classes/swift_proxy_keystone_spec.rb
View File

@@ -11,10 +11,7 @@ describe 'swift::proxy::keystone' do
end
let :pre_condition do
'
include concat::setup
concat { "/etc/swift/proxy-server.conf": }
'
'concat { "/etc/swift/proxy-server.conf": }'
end
it { is_expected.to contain_file(fragment_file).with_content(/[filter:keystone]/) }

3
spec/classes/swift_proxy_ratelimit_spec.rb
View File

@@ -7,8 +7,7 @@ describe 'swift::proxy::ratelimit' do
end
let :pre_condition do
'class { "concat::setup": }
concat { "/etc/swift/proxy-server.conf": }'
'concat { "/etc/swift/proxy-server.conf": }'
end
let :fragment_file do

3
spec/classes/swift_proxy_s3token_spec.rb
View File

@@ -7,8 +7,7 @@ describe 'swift::proxy::s3token' do
end
let :pre_condition do
'class { "concat::setup": }
concat { "/etc/swift/proxy-server.conf": }'
'concat { "/etc/swift/proxy-server.conf": }'
end
let :fragment_file do

3
spec/classes/swift_proxy_slo_spec.rb
View File

@@ -7,8 +7,7 @@ describe 'swift::proxy::slo' do
end
let :pre_condition do
'class { "concat::setup": }
concat { "/etc/swift/proxy-server.conf": }'
'concat { "/etc/swift/proxy-server.conf": }'
end
let :fragment_file do

3
spec/classes/swift_proxy_staticweb_spec.rb
View File

@@ -7,8 +7,7 @@ describe 'swift::proxy::staticweb' do
end
let :pre_condition do
'class { "concat::setup": }
concat { "/etc/swift/proxy-server.conf": }'
'concat { "/etc/swift/proxy-server.conf": }'
end
let :fragment_file do

3
spec/classes/swift_proxy_swauth_spec.rb
View File

@@ -7,8 +7,7 @@ describe 'swift::proxy::swauth' do
end
let :pre_condition do
'class { "concat::setup": }
concat { "/etc/swift/proxy-server.conf": }'
'concat { "/etc/swift/proxy-server.conf": }'
end
let :fragment_file do

3
spec/classes/swift_proxy_swift3_spec.rb
View File

@@ -8,8 +8,7 @@ describe 'swift::proxy::swift3' do
end
let :pre_condition do
'class { "concat::setup": }
concat { "/etc/swift/proxy-server.conf": }'
'concat { "/etc/swift/proxy-server.conf": }'
end
let :fragment_file do

3
spec/classes/swift_proxy_tempauth_spec.rb
View File

@@ -16,8 +16,7 @@ describe 'swift::proxy::tempauth' do
let :params do default_params end
let :pre_condition do
'class { "concat::setup": }
concat { "/etc/swift/proxy-server.conf": }'
'concat { "/etc/swift/proxy-server.conf": }'
end
let :fragment_file do

3
spec/classes/swift_proxy_tempurl_spec.rb
View File

@@ -7,8 +7,7 @@ describe 'swift::proxy::tempurl' do
end
let :pre_condition do
'class { "concat::setup": }
concat { "/etc/swift/proxy-server.conf": }'
'concat { "/etc/swift/proxy-server.conf": }'
end
let :fragment_file do