openstack/puppet-swift
Code Issues Proposed changes

Ensure python-swiftclient is installed to use swift-dispersion

Browse Source 
Change-Id: I03a27989bbcb957227ca2ab1f5c54420b29bb24a
This commit is contained in:
Mehdi Abaakouk 2013-01-31 09:53:39 +01:00
parent f849e5d572
commit 45edcd61de
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/dispersion.pp
View File

@ -84,6 +84,7 @@ class swift::dispersion (
timeout => 0, timeout => 0,
onlyif => "swift -A ${auth_url} -U ${auth_tenant}:${auth_user} -K ${auth_pass} -V ${auth_version} stat | grep 'Account: '", onlyif => "swift -A ${auth_url} -U ${auth_tenant}:${auth_user} -K ${auth_pass} -V ${auth_version} stat | grep 'Account: '",
unless => "swift -A ${auth_url} -U ${auth_tenant}:${auth_user} -K ${auth_pass} -V ${auth_version} list | grep dispersion_", unless => "swift -A ${auth_url} -U ${auth_tenant}:${auth_user} -K ${auth_pass} -V ${auth_version} list | grep dispersion_",
require => Package["swiftclient"],
} }
} }

3
spec/classes/swift_dispersion_spec.rb
View File

@ -49,7 +49,8 @@ describe 'swift::dispersion' do
:path => ['/bin', '/usr/bin'], :path => ['/bin', '/usr/bin'],
:subscribe => 'File[/etc/swift/dispersion.conf]', :subscribe => 'File[/etc/swift/dispersion.conf]',
:onlyif => "swift -A http://127.0.0.1:5000/v2.0/ -U services:dispersion -K dispersion_password -V 2.0 stat | grep 'Account: '", :onlyif => "swift -A http://127.0.0.1:5000/v2.0/ -U services:dispersion -K dispersion_password -V 2.0 stat | grep 'Account: '",
:unless => "swift -A http://127.0.0.1:5000/v2.0/ -U services:dispersion -K dispersion_password -V 2.0 list | grep dispersion_" :unless => "swift -A http://127.0.0.1:5000/v2.0/ -U services:dispersion -K dispersion_password -V 2.0 list | grep dispersion_",
:require => 'Package[swiftclient]'
)} )}
end end