openstack/puppet-swift
Code Issues Proposed changes

Fix compatibility with latest puppetlabs-concat

Browse Source 
concat::setup has been made a private class and can no longer be
included from modules outside concat itself.

concat::setup is already included by the concat define. Removing
its inclusion from puppet-swift classes shouldn't result in breakage
or loss of functionality.

Change-Id: I7566e09bd4e93aec719a495279cf92d8a898057e
Closes-bug: #1245936
This commit is contained in:
Mathieu Gagné
2013-10-29 11:48:48 -04:00
parent 943c2f0c6e
commit 23cc3616ce
17 changed files with 15 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/proxy.pp
View File

@@ -56,7 +56,6 @@ class swift::proxy(
) {
include swift::params
include concat::setup
validate_bool($account_autocreate)
validate_bool($allow_account_management)

1
manifests/storage/server.pp
View File

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

5
spec/classes/swift_proxy_authtoken_spec.rb
View File

@@ -9,10 +9,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_cache_spec.rb
View File

@@ -12,8 +12,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

@@ -9,8 +9,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

@@ -10,8 +10,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 { "ssh::server::install": }
class { "swift":
swift_hash_suffix => "dummy"

3
spec/classes/swift_proxy_formpost_spec.rb
View File

@@ -9,8 +9,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_healthcheck_spec.rb
View File

@@ -9,8 +9,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

@@ -13,10 +13,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 { should contain_file(fragment_file).with_content(/[filter:keystone]/) }

3
spec/classes/swift_proxy_ratelimit_spec.rb
View File

@@ -9,8 +9,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

@@ -9,8 +9,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_staticweb_spec.rb
View File

@@ -9,8 +9,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

@@ -9,8 +9,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

@@ -9,8 +9,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_tempurl_spec.rb
View File

@@ -9,8 +9,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

3
spec/defines/swift_storage_filter_healthcheck_spec.rb
View File

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

3
spec/defines/swift_storage_filter_recon_spec.rb
View File

@@ -12,8 +12,7 @@ describe 'swift::storage::filter::recon' do
end
let :pre_condition do
'class { "concat::setup": }
concat { "/etc/swift/dummy-server.conf": }'
'concat { "/etc/swift/dummy-server.conf": }'
end
let :fragment_file do