openstack/fuel-library
Code Issues Proposed changes

Fix keystone auth_token filter for swift

Browse Source 
Change-Id: I0f9fcc25324eae3605246c167cadc9a369ab2129
Closes-Bug: #1365406
Related-Bug: #1305822
This commit is contained in:
Matthew Mosesohn 2014-09-04 13:50:30 +04:00
parent bc23f1359b
commit 11fa054558
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/swift/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(/paste.filter_factory = keystone.middleware.swift_auth:filter_factory/) }
it { should contain_file(fragment_file).with_content(/paste.filter_factory = keystoneclient.middleware.swift_auth:filter_factory/) }
describe 'with defaults' do

4
deployment/puppet/swift/spec/classes/swift_proxy_s3token_spec.rb
View File

@ -24,7 +24,7 @@ describe 'swift::proxy::s3token' do
verify_contents(subject, fragment_file,
[
'[filter:s3token]',
'paste.filter_factory = keystone.middleware.s3_token:filter_factory',
'paste.filter_factory = keystoneclient.middleware.s3_token:filter_factory',
'auth_port = 5000',
'auth_protocol = http',
'auth_host = 127.0.0.1'
@ -45,7 +45,7 @@ describe 'swift::proxy::s3token' do
verify_contents(subject, fragment_file,
[
'[filter:s3token]',
'paste.filter_factory = keystone.middleware.s3_token:filter_factory',
'paste.filter_factory = keystoneclient.middleware.s3_token:filter_factory',
'auth_port = 4212',
'auth_protocol = https',
'auth_host = 1.2.3.4'

2
deployment/puppet/swift/templates/proxy/s3token.conf.erb
View File

@ -1,5 +1,5 @@
[filter:s3token]
paste.filter_factory = keystone.middleware.s3_token:filter_factory
paste.filter_factory = keystoneclient.middleware.s3_token:filter_factory
auth_port = <%= @auth_port %>
auth_protocol = <%= @auth_protocol %>
auth_host = <%= @auth_host %>