openstack/puppet-swift
Code Issues Proposed changes

Fix dependency problem in class swift

Browse Source 
Class swift requires class['ssh::server::install'], otherwise it will
complain and fail to compile the catalog.

Change-Id: Ieeef735cc3e78bb6a6b514c711e5b87a861ee31b
This commit is contained in:
Newptone 2013-05-27 15:56:11 +08:00
parent aac6528f70
commit b0f4834165
6 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/all.pp
View File

@ -10,7 +10,6 @@ Exec { logoutput => true }
package { 'curl': ensure => present } package { 'curl': ensure => present }
class { 'ssh::server::install': }
class { 'memcached': class { 'memcached':
listen_ip => $swift_local_net_ip, listen_ip => $swift_local_net_ip,

1
examples/site.pp
View File

@ -101,7 +101,6 @@ node swift-keystone {
node swift_base { node swift_base {
class { 'ssh::server::install': }
class { 'swift': class { 'swift':
# not sure how I want to deal with this shared secret # not sure how I want to deal with this shared secret

1
manifests/init.pp
View File

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

3
spec/classes/swift_proxy_spec.rb
View File

@ -25,8 +25,7 @@ describe 'swift::proxy' do
let :pre_condition do let :pre_condition do
"class { memcached: max_memory => 1} "class { memcached: max_memory => 1}
class { swift: swift_hash_suffix => string } class { swift: swift_hash_suffix => string }"
class { 'ssh::server::install': }"
end end
describe 'without the proxy local network ip address being specified' do describe 'without the proxy local network ip address being specified' do

4
spec/classes/swift_ringbuilder_spec.rb
View File

@ -18,8 +18,7 @@ describe 'swift::ringbuilder' do
let :pre_condition do let :pre_condition do
"class { memcached: max_memory => 1} "class { memcached: max_memory => 1}
class { swift: swift_hash_suffix => string } class { swift: swift_hash_suffix => string }"
class { 'ssh::server::install': }"
end end
it 'should rebalance the ring for all ring types' do it 'should rebalance the ring for all ring types' do
@ -60,7 +59,6 @@ describe 'swift::ringbuilder' do
let :pre_condition do let :pre_condition do
'class { memcached: max_memory => 1} 'class { memcached: max_memory => 1}
class { swift: swift_hash_suffix => string } class { swift: swift_hash_suffix => string }
class { "ssh::server::install": }
ring_object_device { "127.0.0.1:6000/1": ring_object_device { "127.0.0.1:6000/1":
zone => 1, zone => 1,
weight => 1, weight => 1,

12
spec/classes/swift_spec.rb
View File

@ -13,10 +13,6 @@ describe 'swift' do
} }
end end
let :pre_condition do
"include ssh::server::install"
end
describe 'when no swift hash is specified' do describe 'when no swift hash is specified' do
let :params do let :params do
{} {}
@ -26,14 +22,6 @@ describe 'swift' do
end end
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 describe 'when using the default value for package_ensure' do
let :file_defaults do let :file_defaults do