Merge "Fix compatibility with latest puppetlabs-concat"

manifests/proxy.pp

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

manifests/storage/server.pp

@@ -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$')

spec/classes/swift_proxy_authtoken_spec.rb

@@ -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

spec/classes/swift_proxy_cache_spec.rb

@@ -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
 

spec/classes/swift_proxy_catch_errors_spec.rb

@@ -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

spec/classes/swift_proxy_ceilometer_spec.rb

@@ -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"

spec/classes/swift_proxy_formpost_spec.rb

@@ -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

spec/classes/swift_proxy_healthcheck_spec.rb

@@ -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

spec/classes/swift_proxy_keystone_spec.rb

@@ -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]/) }

spec/classes/swift_proxy_ratelimit_spec.rb

@@ -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

spec/classes/swift_proxy_s3token_spec.rb

@@ -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

spec/classes/swift_proxy_staticweb_spec.rb

@@ -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

spec/classes/swift_proxy_swauth_spec.rb

@@ -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

spec/classes/swift_proxy_swift3_spec.rb

@@ -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

spec/classes/swift_proxy_tempurl_spec.rb

@@ -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

spec/defines/swift_storage_filter_healthcheck_spec.rb

@@ -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

spec/defines/swift_storage_filter_recon_spec.rb

@@ -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