openstack/keystone
Code Issues Proposed changes

Merge "Rename tokenauth to authtoken."

Browse Source
This commit is contained in:
Jenkins 2012-03-20 23:59:16 +00:00 committed by Gerrit Code Review
commit 885f8d5950
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/source/configuringservices.rst
View File

@ -133,7 +133,7 @@ rather than it's built in 'tempauth'.
user = <user>
[pipeline:main]
pipeline = catch_errors healthcheck cache tokenauth keystone proxy-server
pipeline = catch_errors healthcheck cache authtoken keystone proxy-server
[app:proxy-server]
use = egg:swift#proxy
@ -143,7 +143,7 @@ rather than it's built in 'tempauth'.
paste.filter_factory = keystone.middleware.swift_auth:filter_factory
operator_roles = admin, swiftoperator
[filter:tokenauth]
[filter:authtoken]
paste.filter_factory = keystone.middleware.auth_token:filter_factory
service_port = 5000
service_host = 127.0.0.1
@ -196,7 +196,7 @@ S3 api.
user = <user>
[pipeline:main]
pipeline = catch_errors healthcheck cache swift3 s3token tokenauth keystone proxy-server
pipeline = catch_errors healthcheck cache swift3 s3token authtoken keystone proxy-server
[app:proxy-server]
use = egg:swift#proxy
@ -227,7 +227,7 @@ S3 api.
auth_token = ADMIN
admin_token = ADMIN
[filter:tokenauth]
[filter:authtoken]
paste.filter_factory = keystone.middleware.auth_token:filter_factory
service_port = 5000
service_host = 127.0.0.1
@ -267,7 +267,7 @@ still valid.
Here is an example paste config filter that makes use of the 'admin_user' and
'admin_password' parameters::
[filter:tokenauth]
[filter:authtoken]
paste.filter_factory = keystone.middleware.auth_token:filter_factory
service_port = 5000
service_host = 127.0.0.1

9
keystone/middleware/swift_auth.py
View File

@ -38,10 +38,15 @@ from swift.common.middleware import acl as swift_acl
class SwiftAuth(object):
"""Swift middleware to Keystone authorization system.
In Swift's proxy-server.conf add the middleware to your pipeline::
In Swift's proxy-server.conf add this middleware to your pipeline::
[pipeline:main]
pipeline = catch_errors cache tokenauth swiftauth proxy-server
pipeline = catch_errors cache authtoken swiftauth proxy-server
Make sure you have the authtoken middleware before the swiftauth
middleware. The authtoken will take care of validating the user
and swiftauth middleware will authorize it. See the documentation
about how to configure the authtoken middleware.
Set account auto creation to true::