openstack/puppet-swift
Code Issues Proposed changes

Enlarging the scope of ssh module

Browse Source 
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
This commit is contained in:
Michal Skalski 2014-08-12 16:59:04 +02:00
parent cd3ef0bba3
commit e6a225d79b
29 changed files with 29 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/init.pp
View File

@ -30,7 +30,7 @@ class swift(
) {
include swift::params
include ssh::server::install
include ssh::server
Class['ssh::server::install'] -> Class['swift']

4
spec/classes/swift_proxy_account_quotas_spec.rb
View File

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

4
spec/classes/swift_proxy_authtoken_spec.rb
View File

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

4
spec/classes/swift_proxy_bulk_spec.rb
View File

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

3
spec/classes/swift_proxy_cache_spec.rb
View File

@ -6,8 +6,7 @@ describe 'swift::proxy::cache' do
{
:operatingsystem => 'Ubuntu',
:osfamily => 'Debian',
:processorcount => 1,
:concat_basedir => '/var/lib/puppet/concat',
:processorcount => 1
}
end

4
spec/classes/swift_proxy_catch_errors_spec.rb
View File

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

1
spec/classes/swift_proxy_ceilometer_spec.rb
View File

@ -4,7 +4,6 @@ describe 'swift::proxy::ceilometer' do
let :facts do
{
:concat_basedir => '/var/lib/puppet/concat',
:osfamily => 'Debian'
}
end

4
spec/classes/swift_proxy_container_quotas_spec.rb
View File

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

4
spec/classes/swift_proxy_crossdomain_spec.rb
View File

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

4
spec/classes/swift_proxy_formpost_spec.rb
View File

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

4
spec/classes/swift_proxy_gatekeeper_spec.rb
View File

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

4
spec/classes/swift_proxy_healthcheck_spec.rb
View File

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

4
spec/classes/swift_proxy_keystone_spec.rb
View File

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

4
spec/classes/swift_proxy_ratelimit_spec.rb
View File

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

4
spec/classes/swift_proxy_s3token_spec.rb
View File

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

4
spec/classes/swift_proxy_slo_spec.rb
View File

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

3
spec/classes/swift_proxy_spec.rb
View File

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

4
spec/classes/swift_proxy_staticweb_spec.rb
View File

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

4
spec/classes/swift_proxy_swauth_spec.rb
View File

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

3
spec/classes/swift_proxy_swift3_spec.rb
View File

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

4
spec/classes/swift_proxy_tempurl_spec.rb
View File

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

3
spec/classes/swift_ringbuilder_spec.rb
View File

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

7
spec/classes/swift_storage_all_spec.rb
View File

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

3
spec/classes/swift_storage_container_spec.rb
View File

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

4
spec/defines/swift_storage_filter_healthcheck_spec.rb
View File

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

4
spec/defines/swift_storage_filter_recon_spec.rb
View File

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

3
spec/defines/swift_storage_node_spec.rb
View File

@ -4,8 +4,7 @@ describe 'swift::storage::node' do
{
:operatingsystem => 'Ubuntu',
:osfamily => 'Debian',
:processorcount => 1,
:concat_basedir => '/var/lib/puppet/concat',
:processorcount => 1
}
end

3
spec/defines/swift_storage_server_spec.rb
View File

@ -5,8 +5,7 @@ describe 'swift::storage::server' do
{
:operatingsystem => 'Ubuntu',
:osfamily => 'Debian',
:processorcount => 1,
:concat_basedir => '/var/lib/puppet/concat',
:processorcount => 1
}
end

1
spec/spec_helper.rb
View File

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