From 23cc3616cea78b8431181af748a1827add18974f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathieu=20Gagne=CC=81?= <mgagne@iweb.com>
Date: Tue, 29 Oct 2013 11:48:48 -0400
Subject: [PATCH] Fix compatibility with latest puppetlabs-concat
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
---
manifests/proxy.pp | 1 -
manifests/storage/server.pp | 1 -
spec/classes/swift_proxy_authtoken_spec.rb | 5 +----
spec/classes/swift_proxy_cache_spec.rb | 3 +--
spec/classes/swift_proxy_catch_errors_spec.rb | 3 +--
spec/classes/swift_proxy_ceilometer_spec.rb | 3 +--
spec/classes/swift_proxy_formpost_spec.rb | 3 +--
spec/classes/swift_proxy_healthcheck_spec.rb | 3 +--
spec/classes/swift_proxy_keystone_spec.rb | 5 +----
spec/classes/swift_proxy_ratelimit_spec.rb | 3 +--
spec/classes/swift_proxy_s3token_spec.rb | 3 +--
spec/classes/swift_proxy_staticweb_spec.rb | 3 +--
spec/classes/swift_proxy_swauth_spec.rb | 3 +--
spec/classes/swift_proxy_swift3_spec.rb | 3 +--
spec/classes/swift_proxy_tempurl_spec.rb | 3 +--
spec/defines/swift_storage_filter_healthcheck_spec.rb | 3 +--
spec/defines/swift_storage_filter_recon_spec.rb | 3 +--
17 files changed, 15 insertions(+), 36 deletions(-)
diff --git a/manifests/proxy.pp b/manifests/proxy.pp
index e9133ed3..ab39ce54 100644
--- a/manifests/proxy.pp
+++ b/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)
diff --git a/manifests/storage/server.pp b/manifests/storage/server.pp
index 1f32ba0b..9f77a47b 100644
--- a/manifests/storage/server.pp
+++ b/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$')
diff --git a/spec/classes/swift_proxy_authtoken_spec.rb b/spec/classes/swift_proxy_authtoken_spec.rb
index 893ea553..eda71618 100644
--- a/spec/classes/swift_proxy_authtoken_spec.rb
+++ b/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
diff --git a/spec/classes/swift_proxy_cache_spec.rb b/spec/classes/swift_proxy_cache_spec.rb
index 41644558..d8168ed4 100644
--- a/spec/classes/swift_proxy_cache_spec.rb
+++ b/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
diff --git a/spec/classes/swift_proxy_catch_errors_spec.rb b/spec/classes/swift_proxy_catch_errors_spec.rb
index 2fcb8294..0d7dbf8e 100644
--- a/spec/classes/swift_proxy_catch_errors_spec.rb
+++ b/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
diff --git a/spec/classes/swift_proxy_ceilometer_spec.rb b/spec/classes/swift_proxy_ceilometer_spec.rb
index 2727199f..21019829 100644
--- a/spec/classes/swift_proxy_ceilometer_spec.rb
+++ b/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"
diff --git a/spec/classes/swift_proxy_formpost_spec.rb b/spec/classes/swift_proxy_formpost_spec.rb
index caadff8d..6de02276 100644
--- a/spec/classes/swift_proxy_formpost_spec.rb
+++ b/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
diff --git a/spec/classes/swift_proxy_healthcheck_spec.rb b/spec/classes/swift_proxy_healthcheck_spec.rb
index 77e66dc1..4216a0aa 100644
--- a/spec/classes/swift_proxy_healthcheck_spec.rb
+++ b/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
diff --git a/spec/classes/swift_proxy_keystone_spec.rb b/spec/classes/swift_proxy_keystone_spec.rb
index 52e71a6d..81b7f095 100644
--- a/spec/classes/swift_proxy_keystone_spec.rb
+++ b/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]/) }
diff --git a/spec/classes/swift_proxy_ratelimit_spec.rb b/spec/classes/swift_proxy_ratelimit_spec.rb
index 054e79eb..c7702964 100644
--- a/spec/classes/swift_proxy_ratelimit_spec.rb
+++ b/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
diff --git a/spec/classes/swift_proxy_s3token_spec.rb b/spec/classes/swift_proxy_s3token_spec.rb
index 9bfeaa59..f84af8ed 100644
--- a/spec/classes/swift_proxy_s3token_spec.rb
+++ b/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
diff --git a/spec/classes/swift_proxy_staticweb_spec.rb b/spec/classes/swift_proxy_staticweb_spec.rb
index b7f2c353..0ed7672d 100644
--- a/spec/classes/swift_proxy_staticweb_spec.rb
+++ b/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
diff --git a/spec/classes/swift_proxy_swauth_spec.rb b/spec/classes/swift_proxy_swauth_spec.rb
index 08c94dd4..5c4d7c3a 100644
--- a/spec/classes/swift_proxy_swauth_spec.rb
+++ b/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
diff --git a/spec/classes/swift_proxy_swift3_spec.rb b/spec/classes/swift_proxy_swift3_spec.rb
index f1dc674c..84d81050 100644
--- a/spec/classes/swift_proxy_swift3_spec.rb
+++ b/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
diff --git a/spec/classes/swift_proxy_tempurl_spec.rb b/spec/classes/swift_proxy_tempurl_spec.rb
index 87eac0de..7ebf3a3e 100644
--- a/spec/classes/swift_proxy_tempurl_spec.rb
+++ b/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
diff --git a/spec/defines/swift_storage_filter_healthcheck_spec.rb b/spec/defines/swift_storage_filter_healthcheck_spec.rb
index 0acd912c..f1ccb82c 100644
--- a/spec/defines/swift_storage_filter_healthcheck_spec.rb
+++ b/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
diff --git a/spec/defines/swift_storage_filter_recon_spec.rb b/spec/defines/swift_storage_filter_recon_spec.rb
index a56f62f0..37e8acdc 100644
--- a/spec/defines/swift_storage_filter_recon_spec.rb
+++ b/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