From 56c3aad3ea756d53cc5d65a0c3f446e63c520389 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 11 Jan 2016 15:35:22 -0500 Subject: [PATCH] Stop calling ::concat::setup The class is deprecated and has no effect, let's drop it. Change-Id: I36a1bf9f9ac50b7c3d437562e95d172b8e6a95ad --- manifests/proxy.pp | 2 -- spec/defines/swift_storage_filter_healthcheck_spec.rb | 3 +-- spec/defines/swift_storage_filter_recon_spec.rb | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/manifests/proxy.pp b/manifests/proxy.pp index 7a9f898b..0e0292e2 100644 --- a/manifests/proxy.pp +++ b/manifests/proxy.pp @@ -141,8 +141,6 @@ class swift::proxy( $service_provider = $::swift::params::service_provider ) inherits ::swift::params { - include ::concat::setup - Swift_config<| |> ~> Service['swift-proxy-server'] validate_bool($account_autocreate) diff --git a/spec/defines/swift_storage_filter_healthcheck_spec.rb b/spec/defines/swift_storage_filter_healthcheck_spec.rb index e8aca746..d8f78a80 100644 --- a/spec/defines/swift_storage_filter_healthcheck_spec.rb +++ b/spec/defines/swift_storage_filter_healthcheck_spec.rb @@ -10,8 +10,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 9da01c60..e95a36bc 100644 --- a/spec/defines/swift_storage_filter_recon_spec.rb +++ b/spec/defines/swift_storage_filter_recon_spec.rb @@ -10,8 +10,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