openstack/puppet-swift
Code Issues Proposed changes

Merge "Fix compatibility with latest puppetlabs-concat"

Browse Source
This commit is contained in:
Jenkins
2013-10-29 17:08:53 +00:00
committed by Gerrit Code Review
parent 9e110e8c8e 23cc3616ce
commit c9090bf724
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 swift::params
include concat::setup
validate_bool($account_autocreate) validate_bool($account_autocreate)
validate_bool($allow_account_management) 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 "swift::storage::${type}"
include concat::setup
validate_re($name, '^\d+$') validate_re($name, '^\d+$')
validate_re($type, '^object|container|account$') 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 end
let :pre_condition do let :pre_condition do
' 'concat { "/etc/swift/proxy-server.conf": }'
include concat::setup
concat { "/etc/swift/proxy-server.conf": }
'
end end
describe 'when using the default signing directory' do 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 end
let :pre_condition do let :pre_condition do
'class { "concat::setup": } 'concat { "/etc/swift/proxy-server.conf": }
concat { "/etc/swift/proxy-server.conf": }
class { "memcached": max_memory => 1 }' class { "memcached": max_memory => 1 }'
end end

3
spec/classes/swift_proxy_catch_errors_spec.rb
View File

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

3
spec/classes/swift_proxy_ceilometer_spec.rb
View File

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

3
spec/classes/swift_proxy_formpost_spec.rb
View File

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

3
spec/classes/swift_proxy_healthcheck_spec.rb
View File

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

5
spec/classes/swift_proxy_keystone_spec.rb
View File

@@ -13,10 +13,7 @@ describe 'swift::proxy::keystone' do
end end
let :pre_condition do let :pre_condition do
' 'concat { "/etc/swift/proxy-server.conf": }'
include concat::setup
concat { "/etc/swift/proxy-server.conf": }
'
end end
it { should contain_file(fragment_file).with_content(/[filter:keystone]/) } 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 end
let :pre_condition do let :pre_condition do
'class { "concat::setup": } 'concat { "/etc/swift/proxy-server.conf": }'
concat { "/etc/swift/proxy-server.conf": }'
end end
let :fragment_file do let :fragment_file do

3
spec/classes/swift_proxy_s3token_spec.rb
View File

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

3
spec/classes/swift_proxy_staticweb_spec.rb
View File

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

3
spec/classes/swift_proxy_swauth_spec.rb
View File

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

3
spec/classes/swift_proxy_swift3_spec.rb
View File

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

3
spec/classes/swift_proxy_tempurl_spec.rb
View File

@@ -9,8 +9,7 @@ describe 'swift::proxy::tempurl' do
end end
let :pre_condition do let :pre_condition do
'class { "concat::setup": } 'concat { "/etc/swift/proxy-server.conf": }'
concat { "/etc/swift/proxy-server.conf": }'
end end
let :fragment_file do 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 end
let :pre_condition do let :pre_condition do
'class { "concat::setup": } 'concat { "/etc/swift/dummy-server.conf": }'
concat { "/etc/swift/dummy-server.conf": }'
end end
let :fragment_file do 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 end
let :pre_condition do let :pre_condition do
'class { "concat::setup": } 'concat { "/etc/swift/dummy-server.conf": }'
concat { "/etc/swift/dummy-server.conf": }'
end end
let :fragment_file do let :fragment_file do