openstack
/
puppet-swift
Code Issues Proposed changes

Merge "Use new keystoneclient middleware."

This commit is contained in:
Jenkins 2013-05-19 02:27:18 +00:00 committed by Gerrit Code Review
parent 63c550fbcd e6591fdd49
commit c43a47a0ea
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spec/classes/swift_proxy_authtoken_spec.rb
View File

@ -24,7 +24,7 @@ describe 'swift::proxy::authtoken' do
verify_contents(subject, fragment_file, verify_contents(subject, fragment_file,
[ [
'[filter:authtoken]', '[filter:authtoken]',
'paste.filter_factory = keystone.middleware.auth_token:filter_factory', 'paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory',
'signing_dir = /etc/swift', 'signing_dir = /etc/swift',
'auth_host = 127.0.0.1', 'auth_host = 127.0.0.1',
'auth_port = 35357', 'auth_port = 35357',

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

@ -1,5 +1,5 @@
[filter:authtoken] [filter:authtoken]
paste.filter_factory = keystone.middleware.auth_token:filter_factory paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
signing_dir = /etc/swift signing_dir = /etc/swift
auth_host = <%= auth_host %> auth_host = <%= auth_host %>
auth_port = <%= auth_port %> auth_port = <%= auth_port %>