openstack/puppet-swift
Code Issues Proposed changes

Fix s3_token filter configuration for swift-proxy

Browse Source 
Since Juno s3_token middleware is a part of keystoneclient, not
keystone.

Change-Id: I97da480fcf5ce62da99c31481b181b8b61375db5
Closes-bug: 1384149
This commit is contained in:
Aleksandr Didenko
2014-10-22 12:51:56 +03:00
parent 1591f769ba
commit 2dea09fed5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spec/classes/swift_proxy_s3token_spec.rb
View File

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

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

@@ -1,5 +1,5 @@
[filter:s3token] [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_port = <%= @auth_port %>
auth_protocol = <%= @auth_protocol %> auth_protocol = <%= @auth_protocol %>
auth_host = <%= @auth_host %> auth_host = <%= @auth_host %>