openstack/puppet-swift
Code Issues Proposed changes

Fix missing package_ensure in swauth

Browse Source
This commit is contained in:
vic 2012-11-07 21:36:01 +04:00 committed by Eugene Kirpichov
parent e9f9c99fe8
commit d1fd4084af
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/proxy/swauth.pp
View File

@ -2,7 +2,8 @@
# [*swauth_super_admin_user*]
class swift::proxy::swauth(
$swauth_endpoint = '127.0.0.1',
$swauth_super_admin_key = 'swauthkey'
$swauth_super_admin_key = 'swauthkey',
$package_ensure = 'present'
) {
package { 'python-swauth':

18
spec/classes/swift_proxy_swauth_spec.rb
View File

@ -17,7 +17,7 @@ describe 'swift::proxy::swauth' do
"/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/20_swift_proxy_swauth"
end
it { should contain_package('python-swauth') }
it { should contain_package('python-swauth').with_ensure('present') }
it { should contain_file(fragment_file).with_content(/[filter:swauth]/) }
it { should contain_file(fragment_file).with_content(/use = egg:swauth#swauth/) }
@ -29,23 +29,17 @@ describe 'swift::proxy::swauth' do
end
describe 'with overridden endpoint' do
describe 'with overridden parameters' do
let :params do
{:swauth_endpoint => '10.0.0.1'}
{:swauth_endpoint => '10.0.0.1',
:swauth_super_admin_key => 'foo',
:package_ensure => 'latest' }
end
it { should contain_file(fragment_file).with_content(/default_swift_cluster = local#10\.0\.0\.1/) }
end
describe 'with overridden admin key' do
let :params do
{:swauth_super_admin_key => 'foo'}
end
it { should contain_file(fragment_file).with_content(/super_admin_key = foo/) }
it { should contain_package('python-swauth').with_ensure('latest') }
end