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
This commit is contained in:
parent
35b386479d
commit
00d10f1c3e
@ -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:
|
||||
|
@ -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':
|
||||
|
@ -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" }
|
||||
]
|
||||
}
|
||||
|
@ -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"
|
||||
}'
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user