openstack/puppet-swift
Code Issues Proposed changes

Merge "Allow setting reseller_prefix for keystone filter"

Browse Source
This commit is contained in:
Jenkins 2014-12-02 16:33:56 +00:00 committed by Gerrit Code Review
commit cd3ef0bba3
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/proxy/keystone.pp
View File

@ -19,7 +19,8 @@
class swift::proxy::keystone( class swift::proxy::keystone(
$operator_roles = ['admin', 'SwiftOperator'], $operator_roles = ['admin', 'SwiftOperator'],
$is_admin = true $is_admin = true,
$reseller_prefix = 'AUTH_'
) { ) {
concat::fragment { 'swift_keystone': concat::fragment { 'swift_keystone':

7
spec/classes/swift_proxy_keystone_spec.rb
View File

@ -27,6 +27,7 @@ describe 'swift::proxy::keystone' do
it { should contain_file(fragment_file).with_content(/operator_roles = admin, SwiftOperator/) } it { should contain_file(fragment_file).with_content(/operator_roles = admin, SwiftOperator/) }
it { should contain_file(fragment_file).with_content(/is_admin = true/) } it { should contain_file(fragment_file).with_content(/is_admin = true/) }
it { should contain_file(fragment_file).with_content(/reseller_prefix = AUTH_/) }
end end
@ -34,12 +35,14 @@ describe 'swift::proxy::keystone' do
let :params do let :params do
{ {
:operator_roles => 'foo', :operator_roles => 'foo',
:is_admin => 'false', :is_admin => 'false',
:reseller_prefix => 'SWIFT_'
} }
it { should contain_file(fragment_file).with_content(/operator_roles = foo/) } it { should contain_file(fragment_file).with_content(/operator_roles = foo/) }
it { should contain_file(fragment_file).with_content(/is_admin = false/) } it { should contain_file(fragment_file).with_content(/is_admin = false/) }
it { should contain_file(fragment_file).with_content(/reseller_prefix = SWIFT_/) }
end end

1
templates/proxy/keystone.conf.erb
View File

@ -3,3 +3,4 @@
use = egg:swift#keystoneauth use = egg:swift#keystoneauth
operator_roles = <%= @operator_roles.to_a.join(', ') %> operator_roles = <%= @operator_roles.to_a.join(', ') %>
is_admin = <%= @is_admin %> is_admin = <%= @is_admin %>
reseller_prefix = <%= @reseller_prefix %>