diff --git a/examples/all.pp b/examples/all.pp index d86085f1..4fce3628 100644 --- a/examples/all.pp +++ b/examples/all.pp @@ -10,7 +10,6 @@ Exec { logoutput => true } package { 'curl': ensure => present } -class { 'ssh::server::install': } class { 'memcached': listen_ip => $swift_local_net_ip, diff --git a/examples/site.pp b/examples/site.pp index a8e9fc45..2c18874b 100644 --- a/examples/site.pp +++ b/examples/site.pp @@ -101,7 +101,6 @@ node swift-keystone { node swift_base { - class { 'ssh::server::install': } class { 'swift': # not sure how I want to deal with this shared secret diff --git a/manifests/init.pp b/manifests/init.pp index 42d91494..02f85631 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -25,6 +25,7 @@ class swift( ) { include swift::params + include ssh::server::install Class['ssh::server::install'] -> Class['swift'] diff --git a/spec/classes/swift_proxy_spec.rb b/spec/classes/swift_proxy_spec.rb index 7cfd2b8f..0f360d19 100644 --- a/spec/classes/swift_proxy_spec.rb +++ b/spec/classes/swift_proxy_spec.rb @@ -25,8 +25,7 @@ describe 'swift::proxy' do let :pre_condition do "class { memcached: max_memory => 1} - class { swift: swift_hash_suffix => string } - class { 'ssh::server::install': }" + class { swift: swift_hash_suffix => string }" end describe 'without the proxy local network ip address being specified' do diff --git a/spec/classes/swift_ringbuilder_spec.rb b/spec/classes/swift_ringbuilder_spec.rb index 68650ebd..4e1ea628 100644 --- a/spec/classes/swift_ringbuilder_spec.rb +++ b/spec/classes/swift_ringbuilder_spec.rb @@ -18,8 +18,7 @@ describe 'swift::ringbuilder' do let :pre_condition do "class { memcached: max_memory => 1} - class { swift: swift_hash_suffix => string } - class { 'ssh::server::install': }" + class { swift: swift_hash_suffix => string }" end it 'should rebalance the ring for all ring types' do @@ -60,7 +59,6 @@ describe 'swift::ringbuilder' do let :pre_condition do 'class { memcached: max_memory => 1} class { swift: swift_hash_suffix => string } - class { "ssh::server::install": } ring_object_device { "127.0.0.1:6000/1": zone => 1, weight => 1, diff --git a/spec/classes/swift_spec.rb b/spec/classes/swift_spec.rb index 503468f1..a6c3abf0 100644 --- a/spec/classes/swift_spec.rb +++ b/spec/classes/swift_spec.rb @@ -13,10 +13,6 @@ describe 'swift' do } end - let :pre_condition do - "include ssh::server::install" - end - describe 'when no swift hash is specified' do let :params do {} @@ -26,14 +22,6 @@ describe 'swift' do end end - describe 'when ssh server install class is not included' do - let :pre_condition do - '' - end - it 'should should raise an exception' do - expect { subject }.to raise_error(Puppet::Error) - end - end describe 'when using the default value for package_ensure' do let :file_defaults do