summaryrefslogtreecommitdiffstats
path: root/keystone
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-05-29 21:58:21 +0000
committerGerrit Code Review <review@openstack.org>2012-05-29 21:58:21 +0000
commit1349e127356c6a25cb2e50008c8b925e5934676a (patch)
treedd6e06109f21fba7ef5644220f45ac21c3d3ba4f /keystone
parentb6dbb103e1c1779474c5d26f3acf47e704cc601c (diff)
parent055d07380347cec2bff14383ed1434852f91336e (diff)
downloadkeystone-1349e127356c6a25cb2e50008c8b925e5934676a.tar.gz
keystone-1349e127356c6a25cb2e50008c8b925e5934676a.tar.xz
keystone-1349e127356c6a25cb2e50008c8b925e5934676a.zip
Merge "Update swift_auth documentation."
Diffstat (limited to 'keystone')
-rw-r--r--keystone/middleware/swift_auth.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/keystone/middleware/swift_auth.py b/keystone/middleware/swift_auth.py
index 798094cd..6a858f75 100644
--- a/keystone/middleware/swift_auth.py
+++ b/keystone/middleware/swift_auth.py
@@ -41,7 +41,7 @@ class SwiftAuth(object):
In Swift's proxy-server.conf add this middleware to your pipeline::
[pipeline:main]
- pipeline = catch_errors cache authtoken swiftauth proxy-server
+ pipeline = catch_errors cache authtoken keystone proxy-server
Make sure you have the authtoken middleware before the swiftauth
middleware. authtoken will take care of validating the user and
@@ -58,10 +58,9 @@ class SwiftAuth(object):
And add a swift authorization filter section, such as::
- [filter:swiftauth]
- use = egg:keystone#swiftauth
+ [filter:keystone]
+ paste.filter_factory = keystone.middleware.auth_token:filter_factory
operator_roles = admin, swiftoperator
- is_admin = false
This maps tenants to account in Swift.