openstack/puppet-swift
Code Issues Proposed changes

Merge "Update keystone fragment to use egg."

Browse Source
This commit is contained in:
Jenkins
2013-04-11 16:48:36 +00:00
committed by Gerrit Code Review
parent adf2b988c4 ab00ec58e2
commit 3c741a78d5
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spec/classes/swift_proxy_keystone_spec.rb
View File

@@ -23,7 +23,7 @@ describe 'swift::proxy::keystone' do
it { should contain_file(fragment_file).with_content(/[filter:keystone]/) } it { should contain_file(fragment_file).with_content(/[filter:keystone]/) }
it { should contain_file(fragment_file).with_content(/paste.filter_factory = keystone.middleware.swift_auth:filter_factory/) } it { should contain_file(fragment_file).with_content(/use = egg:swift#keystoneauth/) }
describe 'with defaults' do describe 'with defaults' do

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

@@ -1,6 +1,6 @@
[filter:keystone] [filter:keystone]
paste.filter_factory = keystone.middleware.swift_auth:filter_factory 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 %>
cache = <%= cache %> cache = <%= cache %>