From e6a225d79b21ab3caebc189da2d1062d57c0f55a Mon Sep 17 00:00:00 2001 From: Michal Skalski Date: Tue, 12 Aug 2014 16:59:04 +0200 Subject: [PATCH] Enlarging the scope of ssh module Including only ssh::server::install class in init.pp give too small scope and cause warnings about inability to look up ssh::server::ensure. Closes-Bug: 1355873 Change-Id: I443c9f006b47c609e4a05da38b4a2124acbf886e --- manifests/init.pp | 2 +- spec/classes/swift_proxy_account_quotas_spec.rb | 4 +--- spec/classes/swift_proxy_authtoken_spec.rb | 4 +--- spec/classes/swift_proxy_bulk_spec.rb | 4 +--- spec/classes/swift_proxy_cache_spec.rb | 3 +-- spec/classes/swift_proxy_catch_errors_spec.rb | 4 +--- spec/classes/swift_proxy_ceilometer_spec.rb | 1 - spec/classes/swift_proxy_container_quotas_spec.rb | 4 +--- spec/classes/swift_proxy_crossdomain_spec.rb | 4 +--- spec/classes/swift_proxy_formpost_spec.rb | 4 +--- spec/classes/swift_proxy_gatekeeper_spec.rb | 4 +--- spec/classes/swift_proxy_healthcheck_spec.rb | 4 +--- spec/classes/swift_proxy_keystone_spec.rb | 4 +--- spec/classes/swift_proxy_ratelimit_spec.rb | 4 +--- spec/classes/swift_proxy_s3token_spec.rb | 4 +--- spec/classes/swift_proxy_slo_spec.rb | 4 +--- spec/classes/swift_proxy_spec.rb | 3 +-- spec/classes/swift_proxy_staticweb_spec.rb | 4 +--- spec/classes/swift_proxy_swauth_spec.rb | 4 +--- spec/classes/swift_proxy_swift3_spec.rb | 3 +-- spec/classes/swift_proxy_tempurl_spec.rb | 4 +--- spec/classes/swift_ringbuilder_spec.rb | 3 +-- spec/classes/swift_storage_all_spec.rb | 7 ++----- spec/classes/swift_storage_container_spec.rb | 3 +-- spec/defines/swift_storage_filter_healthcheck_spec.rb | 4 +--- spec/defines/swift_storage_filter_recon_spec.rb | 4 +--- spec/defines/swift_storage_node_spec.rb | 3 +-- spec/defines/swift_storage_server_spec.rb | 3 +-- spec/spec_helper.rb | 1 + 29 files changed, 29 insertions(+), 75 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 3199fcf6..db693a6d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -30,7 +30,7 @@ class swift( ) { include swift::params - include ssh::server::install + include ssh::server Class['ssh::server::install'] -> Class['swift'] diff --git a/spec/classes/swift_proxy_account_quotas_spec.rb b/spec/classes/swift_proxy_account_quotas_spec.rb index 5b52ba43..99b4d157 100644 --- a/spec/classes/swift_proxy_account_quotas_spec.rb +++ b/spec/classes/swift_proxy_account_quotas_spec.rb @@ -23,9 +23,7 @@ require 'spec_helper' describe 'swift::proxy::account_quotas' do let :facts do - { - :concat_basedir => '/var/lib/puppet/concat' - } + {} end let :pre_condition do diff --git a/spec/classes/swift_proxy_authtoken_spec.rb b/spec/classes/swift_proxy_authtoken_spec.rb index bb2648d2..c89ce42f 100644 --- a/spec/classes/swift_proxy_authtoken_spec.rb +++ b/spec/classes/swift_proxy_authtoken_spec.rb @@ -3,9 +3,7 @@ require 'spec_helper' describe 'swift::proxy::authtoken' do let :facts do - { - :concat_basedir => '/var/lib/puppet/concat', - } + {} end let :pre_condition do diff --git a/spec/classes/swift_proxy_bulk_spec.rb b/spec/classes/swift_proxy_bulk_spec.rb index 513e9d70..4bcf014b 100644 --- a/spec/classes/swift_proxy_bulk_spec.rb +++ b/spec/classes/swift_proxy_bulk_spec.rb @@ -23,9 +23,7 @@ require 'spec_helper' describe 'swift::proxy::bulk' do let :facts do - { - :concat_basedir => '/var/lib/puppet/concat' - } + {} end let :pre_condition do diff --git a/spec/classes/swift_proxy_cache_spec.rb b/spec/classes/swift_proxy_cache_spec.rb index 41644558..c3520ddd 100644 --- a/spec/classes/swift_proxy_cache_spec.rb +++ b/spec/classes/swift_proxy_cache_spec.rb @@ -6,8 +6,7 @@ describe 'swift::proxy::cache' do { :operatingsystem => 'Ubuntu', :osfamily => 'Debian', - :processorcount => 1, - :concat_basedir => '/var/lib/puppet/concat', + :processorcount => 1 } end diff --git a/spec/classes/swift_proxy_catch_errors_spec.rb b/spec/classes/swift_proxy_catch_errors_spec.rb index 2fcb8294..69bd74d8 100644 --- a/spec/classes/swift_proxy_catch_errors_spec.rb +++ b/spec/classes/swift_proxy_catch_errors_spec.rb @@ -3,9 +3,7 @@ require 'spec_helper' describe 'swift::proxy::catch_errors' do let :facts do - { - :concat_basedir => '/var/lib/puppet/concat' - } + {} end let :pre_condition do diff --git a/spec/classes/swift_proxy_ceilometer_spec.rb b/spec/classes/swift_proxy_ceilometer_spec.rb index 2727199f..cc17e31a 100644 --- a/spec/classes/swift_proxy_ceilometer_spec.rb +++ b/spec/classes/swift_proxy_ceilometer_spec.rb @@ -4,7 +4,6 @@ describe 'swift::proxy::ceilometer' do let :facts do { - :concat_basedir => '/var/lib/puppet/concat', :osfamily => 'Debian' } end diff --git a/spec/classes/swift_proxy_container_quotas_spec.rb b/spec/classes/swift_proxy_container_quotas_spec.rb index 737967d4..fc7f8bc1 100644 --- a/spec/classes/swift_proxy_container_quotas_spec.rb +++ b/spec/classes/swift_proxy_container_quotas_spec.rb @@ -23,9 +23,7 @@ require 'spec_helper' describe 'swift::proxy::container_quotas' do let :facts do - { - :concat_basedir => '/var/lib/puppet/concat' - } + {} end let :pre_condition do diff --git a/spec/classes/swift_proxy_crossdomain_spec.rb b/spec/classes/swift_proxy_crossdomain_spec.rb index 155765c3..8e56ce3f 100644 --- a/spec/classes/swift_proxy_crossdomain_spec.rb +++ b/spec/classes/swift_proxy_crossdomain_spec.rb @@ -3,9 +3,7 @@ require 'spec_helper' describe 'swift::proxy::crossdomain' do let :facts do - { - :concat_basedir => '/var/lib/puppet/concat' - } + {} end let :pre_condition do diff --git a/spec/classes/swift_proxy_formpost_spec.rb b/spec/classes/swift_proxy_formpost_spec.rb index caadff8d..38c05d67 100644 --- a/spec/classes/swift_proxy_formpost_spec.rb +++ b/spec/classes/swift_proxy_formpost_spec.rb @@ -3,9 +3,7 @@ require 'spec_helper' describe 'swift::proxy::formpost' do let :facts do - { - :concat_basedir => '/var/lib/puppet/concat' - } + {} end let :pre_condition do diff --git a/spec/classes/swift_proxy_gatekeeper_spec.rb b/spec/classes/swift_proxy_gatekeeper_spec.rb index 35ff59e6..8e629f64 100644 --- a/spec/classes/swift_proxy_gatekeeper_spec.rb +++ b/spec/classes/swift_proxy_gatekeeper_spec.rb @@ -3,9 +3,7 @@ require 'spec_helper' describe 'swift::proxy::gatekeeper' do let :facts do - { - :concat_basedir => '/var/lib/puppet/concat' - } + {} end let :pre_condition do diff --git a/spec/classes/swift_proxy_healthcheck_spec.rb b/spec/classes/swift_proxy_healthcheck_spec.rb index 77e66dc1..abc086af 100644 --- a/spec/classes/swift_proxy_healthcheck_spec.rb +++ b/spec/classes/swift_proxy_healthcheck_spec.rb @@ -3,9 +3,7 @@ require 'spec_helper' describe 'swift::proxy::healthcheck' do let :facts do - { - :concat_basedir => '/var/lib/puppet/concat' - } + {} end let :pre_condition do diff --git a/spec/classes/swift_proxy_keystone_spec.rb b/spec/classes/swift_proxy_keystone_spec.rb index ec3a4edf..7c21bf7e 100644 --- a/spec/classes/swift_proxy_keystone_spec.rb +++ b/spec/classes/swift_proxy_keystone_spec.rb @@ -3,9 +3,7 @@ require 'spec_helper' describe 'swift::proxy::keystone' do let :facts do - { - :concat_basedir => '/var/lib/puppet/concat', - } + {} end let :fragment_file do diff --git a/spec/classes/swift_proxy_ratelimit_spec.rb b/spec/classes/swift_proxy_ratelimit_spec.rb index 054e79eb..4c9550db 100644 --- a/spec/classes/swift_proxy_ratelimit_spec.rb +++ b/spec/classes/swift_proxy_ratelimit_spec.rb @@ -3,9 +3,7 @@ require 'spec_helper' describe 'swift::proxy::ratelimit' do let :facts do - { - :concat_basedir => '/var/lib/puppet/concat' - } + {} end let :pre_condition do diff --git a/spec/classes/swift_proxy_s3token_spec.rb b/spec/classes/swift_proxy_s3token_spec.rb index 5ef214aa..7074ed35 100644 --- a/spec/classes/swift_proxy_s3token_spec.rb +++ b/spec/classes/swift_proxy_s3token_spec.rb @@ -3,9 +3,7 @@ require 'spec_helper' describe 'swift::proxy::s3token' do let :facts do - { - :concat_basedir => '/var/lib/puppet/concat' - } + {} end let :pre_condition do diff --git a/spec/classes/swift_proxy_slo_spec.rb b/spec/classes/swift_proxy_slo_spec.rb index 262d48e2..43f05c2d 100644 --- a/spec/classes/swift_proxy_slo_spec.rb +++ b/spec/classes/swift_proxy_slo_spec.rb @@ -3,9 +3,7 @@ require 'spec_helper' describe 'swift::proxy::slo' do let :facts do - { - :concat_basedir => '/var/lib/puppet/concat' - } + {} end let :pre_condition do diff --git a/spec/classes/swift_proxy_spec.rb b/spec/classes/swift_proxy_spec.rb index 4dfe8b0f..8ff19283 100644 --- a/spec/classes/swift_proxy_spec.rb +++ b/spec/classes/swift_proxy_spec.rb @@ -12,8 +12,7 @@ describe 'swift::proxy' do let :facts do {:operatingsystem => 'Ubuntu', :osfamily => 'Debian', - :processorcount => 1, - :concat_basedir => '/var/lib/puppet/concat', + :processorcount => 1 } end diff --git a/spec/classes/swift_proxy_staticweb_spec.rb b/spec/classes/swift_proxy_staticweb_spec.rb index b7f2c353..f98000cd 100644 --- a/spec/classes/swift_proxy_staticweb_spec.rb +++ b/spec/classes/swift_proxy_staticweb_spec.rb @@ -3,9 +3,7 @@ require 'spec_helper' describe 'swift::proxy::staticweb' do let :facts do - { - :concat_basedir => '/var/lib/puppet/concat' - } + {} end let :pre_condition do diff --git a/spec/classes/swift_proxy_swauth_spec.rb b/spec/classes/swift_proxy_swauth_spec.rb index 08c94dd4..528d3c28 100644 --- a/spec/classes/swift_proxy_swauth_spec.rb +++ b/spec/classes/swift_proxy_swauth_spec.rb @@ -3,9 +3,7 @@ require 'spec_helper' describe 'swift::proxy::swauth' do let :facts do - { - :concat_basedir => '/var/lib/puppet/concat' - } + {} end let :pre_condition do diff --git a/spec/classes/swift_proxy_swift3_spec.rb b/spec/classes/swift_proxy_swift3_spec.rb index f1dc674c..f31ac508 100644 --- a/spec/classes/swift_proxy_swift3_spec.rb +++ b/spec/classes/swift_proxy_swift3_spec.rb @@ -3,8 +3,7 @@ require 'spec_helper' describe 'swift::proxy::swift3' do let :facts do - { :concat_basedir => '/var/lib/puppet/concat', - :osfamily => 'Debian', + { :osfamily => 'Debian', :operatingsystem => 'Ubuntu' } end diff --git a/spec/classes/swift_proxy_tempurl_spec.rb b/spec/classes/swift_proxy_tempurl_spec.rb index 87eac0de..3b00c995 100644 --- a/spec/classes/swift_proxy_tempurl_spec.rb +++ b/spec/classes/swift_proxy_tempurl_spec.rb @@ -3,9 +3,7 @@ require 'spec_helper' describe 'swift::proxy::tempurl' do let :facts do - { - :concat_basedir => '/var/lib/puppet/concat' - } + {} end let :pre_condition do diff --git a/spec/classes/swift_ringbuilder_spec.rb b/spec/classes/swift_ringbuilder_spec.rb index 4e1ea628..9f7c65da 100644 --- a/spec/classes/swift_ringbuilder_spec.rb +++ b/spec/classes/swift_ringbuilder_spec.rb @@ -5,8 +5,7 @@ describe 'swift::ringbuilder' do { :operatingsystem => 'Ubuntu', :osfamily => 'Debian', - :processorcount => 1, - :concat_basedir => '/tmp/foo' + :processorcount => 1 } end describe 'when swift class is not included' do diff --git a/spec/classes/swift_storage_all_spec.rb b/spec/classes/swift_storage_all_spec.rb index ada844ff..ceb207e5 100644 --- a/spec/classes/swift_storage_all_spec.rb +++ b/spec/classes/swift_storage_all_spec.rb @@ -5,10 +5,8 @@ describe 'swift::storage::all' do let :facts do { - :concat_basedir => '/tmp/', :operatingsystem => 'Ubuntu', - :osfamily => 'Debian', - :concat_basedir => '/tmp/foo' + :osfamily => 'Debian' } end @@ -118,8 +116,7 @@ describe 'swift::storage::all' do let :facts do { :operatingsystem => 'Debian', - :osfamily => 'Debian', - :concat_basedir => '/tmp/foo' + :osfamily => 'Debian' } end diff --git a/spec/classes/swift_storage_container_spec.rb b/spec/classes/swift_storage_container_spec.rb index 8551b972..74b75933 100644 --- a/spec/classes/swift_storage_container_spec.rb +++ b/spec/classes/swift_storage_container_spec.rb @@ -107,8 +107,7 @@ describe 'swift::storage::container' do context 'on RedHat platforms' do let :facts do { :osfamily => 'RedHat', - :operatingsystem => 'RedHat', - :concat_basedir => '/var/lib/puppet/concat' } + :operatingsystem => 'RedHat' } end let :platform_params do diff --git a/spec/defines/swift_storage_filter_healthcheck_spec.rb b/spec/defines/swift_storage_filter_healthcheck_spec.rb index 0acd912c..fd59a601 100644 --- a/spec/defines/swift_storage_filter_healthcheck_spec.rb +++ b/spec/defines/swift_storage_filter_healthcheck_spec.rb @@ -6,9 +6,7 @@ describe 'swift::storage::filter::healthcheck' do end let :facts do - { - :concat_basedir => '/var/lib/puppet/concat' - } + {} end let :pre_condition do diff --git a/spec/defines/swift_storage_filter_recon_spec.rb b/spec/defines/swift_storage_filter_recon_spec.rb index a56f62f0..da151890 100644 --- a/spec/defines/swift_storage_filter_recon_spec.rb +++ b/spec/defines/swift_storage_filter_recon_spec.rb @@ -6,9 +6,7 @@ describe 'swift::storage::filter::recon' do end let :facts do - { - :concat_basedir => '/var/lib/puppet/concat' - } + {} end let :pre_condition do diff --git a/spec/defines/swift_storage_node_spec.rb b/spec/defines/swift_storage_node_spec.rb index 7ed5f226..19795a2c 100644 --- a/spec/defines/swift_storage_node_spec.rb +++ b/spec/defines/swift_storage_node_spec.rb @@ -4,8 +4,7 @@ describe 'swift::storage::node' do { :operatingsystem => 'Ubuntu', :osfamily => 'Debian', - :processorcount => 1, - :concat_basedir => '/var/lib/puppet/concat', + :processorcount => 1 } end diff --git a/spec/defines/swift_storage_server_spec.rb b/spec/defines/swift_storage_server_spec.rb index 2376e767..a1c7d620 100644 --- a/spec/defines/swift_storage_server_spec.rb +++ b/spec/defines/swift_storage_server_spec.rb @@ -5,8 +5,7 @@ describe 'swift::storage::server' do { :operatingsystem => 'Ubuntu', :osfamily => 'Debian', - :processorcount => 1, - :concat_basedir => '/var/lib/puppet/concat', + :processorcount => 1 } end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 53d4dd02..45654e7e 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -4,4 +4,5 @@ require 'shared_examples' RSpec.configure do |c| c.alias_it_should_behave_like_to :it_configures, 'configures' c.alias_it_should_behave_like_to :it_raises, 'raises' + c.default_facts = { :concat_basedir => '/var/lib/puppet/concat' } end