From 00d10f1c3ebd8103cf256259397ad74b5af0818a Mon Sep 17 00:00:00 2001 From: Richard Raseley Date: Wed, 22 Apr 2015 11:37:31 -0700 Subject: [PATCH] Removal of SSH Components This change removes all SSH-related components, their configuration options, and tests. SSH is such a low-level service (from the perspective of any operator deploying a cloud), that it is reasonable to assume that (or provide direction that) SSH must be installed and configured prior to usage of the puppet-swift module. Without this change, there is a significant liklihood of confusion occurring in the likely case of SSH being managed elsewhere. Change-Id: I0f695788b2784669a3fb285e4bedf0159c4cb89a Closes-Bug: 1447259 --- .fixtures.yml | 3 --- manifests/init.pp | 5 +---- metadata.json | 3 +-- spec/classes/swift_proxy_ceilometer_spec.rb | 1 - spec/classes/swift_storage_account_spec.rb | 3 +-- spec/classes/swift_storage_all_spec.rb | 4 +--- spec/classes/swift_storage_container_spec.rb | 6 ++---- spec/classes/swift_storage_object_spec.rb | 3 +-- spec/classes/swift_storage_spec.rb | 4 +--- spec/defines/swift_storage_generic_spec.rb | 3 +-- spec/defines/swift_storage_node_spec.rb | 3 +-- spec/defines/swift_storage_server_spec.rb | 3 +-- 12 files changed, 11 insertions(+), 30 deletions(-) diff --git a/.fixtures.yml b/.fixtures.yml index 5b3af39a..38acd72d 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -9,9 +9,6 @@ fixtures: "memcached": "git://github.com/saz/puppet-memcached.git" "openstacklib": "git://github.com/stackforge/puppet-openstacklib.git" "rsync": "git://github.com/puppetlabs/puppetlabs-rsync.git" - "ssh": - repo: "git://github.com/saz/puppet-ssh.git" - ref: "v2.4.0" "stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git" "xinetd": "git://github.com/puppetlabs/puppetlabs-xinetd.git" symlinks: diff --git a/manifests/init.pp b/manifests/init.pp index b6595eef..58d58fce 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -14,7 +14,7 @@ # # == Dependencies # -# Class['ssh::server::install'] +# None # # == Authors # @@ -31,9 +31,6 @@ class swift( ) { include ::swift::params - include ::ssh::server - - Class['ssh::server::install'] -> Class['swift'] if !defined(Package['swift']) { package { 'swift': diff --git a/metadata.json b/metadata.json index 0dfd0e06..216bff7e 100644 --- a/metadata.json +++ b/metadata.json @@ -37,7 +37,6 @@ { "name": "puppetlabs/stdlib", "version_requirement": ">=4.0.0 <5.0.0" }, { "name": "puppetlabs/xinetd", "version_requirement": ">=1.0.1 <2.0.0" }, { "name": "puppetlabs/concat", "version_requirement": ">=1.0.0 <2.0.0" }, - { "name": "saz/memcached", "version_requirement": ">=2.0.2 <3.0.0" }, - { "name": "saz/ssh", "version_requirement": ">=2.0.0 <3.0.0" } + { "name": "saz/memcached", "version_requirement": ">=2.0.2 <3.0.0" } ] } diff --git a/spec/classes/swift_proxy_ceilometer_spec.rb b/spec/classes/swift_proxy_ceilometer_spec.rb index 6b010ff4..22322db6 100644 --- a/spec/classes/swift_proxy_ceilometer_spec.rb +++ b/spec/classes/swift_proxy_ceilometer_spec.rb @@ -11,7 +11,6 @@ describe 'swift::proxy::ceilometer' do let :pre_condition do 'class { "concat::setup": } concat { "/etc/swift/proxy-server.conf": } - class { "ssh::server::install": } class { "swift": swift_hash_suffix => "dummy" }' diff --git a/spec/classes/swift_storage_account_spec.rb b/spec/classes/swift_storage_account_spec.rb index 4b7fefae..c52d8b20 100644 --- a/spec/classes/swift_storage_account_spec.rb +++ b/spec/classes/swift_storage_account_spec.rb @@ -2,8 +2,7 @@ require 'spec_helper' describe 'swift::storage::account' do let :pre_condition do - "class { 'ssh::server::install': } - class { 'swift': swift_hash_suffix => 'foo' } + "class { 'swift': swift_hash_suffix => 'foo' } class { 'swift::storage': storage_local_net_ip => '10.0.0.1' }" end diff --git a/spec/classes/swift_storage_all_spec.rb b/spec/classes/swift_storage_all_spec.rb index f4468e82..ced3b219 100644 --- a/spec/classes/swift_storage_all_spec.rb +++ b/spec/classes/swift_storage_all_spec.rb @@ -11,9 +11,7 @@ describe 'swift::storage::all' do end let :pre_condition do - "class { 'swift': swift_hash_suffix => 'changeme' } - include ssh::server::install - " + "class { 'swift': swift_hash_suffix => 'changeme' }" end let :default_params do diff --git a/spec/classes/swift_storage_container_spec.rb b/spec/classes/swift_storage_container_spec.rb index 00534b88..e262cbab 100644 --- a/spec/classes/swift_storage_container_spec.rb +++ b/spec/classes/swift_storage_container_spec.rb @@ -2,8 +2,7 @@ require 'spec_helper' describe 'swift::storage::container' do let :pre_condition do - "class { 'ssh::server::install': } - class { 'swift': swift_hash_suffix => 'foo' } + "class { 'swift': swift_hash_suffix => 'foo' } class { 'swift::storage': storage_local_net_ip => '10.0.0.1' }" end @@ -128,8 +127,7 @@ describe 'swift::storage::container' do end let :pre_condition do - "class { 'ssh::server::install': } - class { 'swift': swift_hash_suffix => 'foo' } + "class { 'swift': swift_hash_suffix => 'foo' } class { 'swift::storage::all': storage_local_net_ip => '10.0.0.1' }" end diff --git a/spec/classes/swift_storage_object_spec.rb b/spec/classes/swift_storage_object_spec.rb index 65c78227..e10fdca2 100644 --- a/spec/classes/swift_storage_object_spec.rb +++ b/spec/classes/swift_storage_object_spec.rb @@ -3,8 +3,7 @@ require 'spec_helper' describe 'swift::storage::object' do let :pre_condition do - "class { 'ssh::server::install': } - class { 'swift': swift_hash_suffix => 'foo' } + "class { 'swift': swift_hash_suffix => 'foo' } class { 'swift::storage': storage_local_net_ip => '10.0.0.1' }" end diff --git a/spec/classes/swift_storage_spec.rb b/spec/classes/swift_storage_spec.rb index 43270f6a..15cd44b9 100644 --- a/spec/classes/swift_storage_spec.rb +++ b/spec/classes/swift_storage_spec.rb @@ -12,9 +12,7 @@ describe 'swift::storage' do describe 'when required classes are specified' do let :pre_condition do - "class { 'swift': swift_hash_suffix => 'changeme' } - include ssh::server::install - " + "class { 'swift': swift_hash_suffix => 'changeme' }" end describe 'when the local net ip is specified' do diff --git a/spec/defines/swift_storage_generic_spec.rb b/spec/defines/swift_storage_generic_spec.rb index b63e8ed9..2e0dae31 100644 --- a/spec/defines/swift_storage_generic_spec.rb +++ b/spec/defines/swift_storage_generic_spec.rb @@ -14,8 +14,7 @@ describe 'swift::storage::generic' do end let :pre_condition do - "class { 'ssh::server::install': } - class { 'swift': swift_hash_suffix => 'foo' } + "class { 'swift': swift_hash_suffix => 'foo' } class { 'swift::storage': storage_local_net_ip => '10.0.0.1' }" end diff --git a/spec/defines/swift_storage_node_spec.rb b/spec/defines/swift_storage_node_spec.rb index 11cea91b..e0fcac47 100644 --- a/spec/defines/swift_storage_node_spec.rb +++ b/spec/defines/swift_storage_node_spec.rb @@ -20,8 +20,7 @@ describe 'swift::storage::node' do end let :pre_condition do - "class { 'ssh::server::install': } - class { 'swift': swift_hash_suffix => 'foo' } + "class { 'swift': swift_hash_suffix => 'foo' } class { 'swift::storage': storage_local_net_ip => '127.0.0.1' }" end diff --git a/spec/defines/swift_storage_server_spec.rb b/spec/defines/swift_storage_server_spec.rb index 1e8e05cd..e0c80223 100644 --- a/spec/defines/swift_storage_server_spec.rb +++ b/spec/defines/swift_storage_server_spec.rb @@ -11,8 +11,7 @@ describe 'swift::storage::server' do end let :pre_condition do - "class { 'ssh::server::install': } - class { 'swift': swift_hash_suffix => 'foo' } + "class { 'swift': swift_hash_suffix => 'foo' } class { 'swift::storage': storage_local_net_ip => '10.0.0.1' }" end let :default_params do