openstack/swift
Code Issues Proposed changes

Merge "Add generated keystone documentation to misc.rst."

Browse Source
This commit is contained in:
Jenkins
2013-02-12 12:03:21 +00:00
committed by Gerrit Code Review
parent e4e55588fb 1b86380e2e
commit af3bd46679
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
doc/source/misc.rst
View File

@@ -44,6 +44,14 @@ TempAuth
.. _acls: .. _acls:
KeystoneAuth
============
.. automodule:: swift.common.middleware.keystoneauth
:members:
:show-inheritance:
ACLs ACLs
==== ====
@@ -180,7 +188,7 @@ Bulk Operations (Delete and Archive Auto Extraction)
:show-inheritance: :show-inheritance:
Container Quotas Container Quotas
============= ================
.. automodule:: swift.common.middleware.container_quotas .. automodule:: swift.common.middleware.container_quotas
:members: :members:

11
swift/common/middleware/keystoneauth.py
View File

@@ -40,14 +40,15 @@ class KeystoneAuth(object):
If support is required for unvalidated users (as with anonymous If support is required for unvalidated users (as with anonymous
access) or for tempurl/formpost middleware, authtoken will need access) or for tempurl/formpost middleware, authtoken will need
to be configured with delay_auth_decision set to 1. See the to be configured with ``delay_auth_decision`` set to 1. See the
Keystone documentation for more detail on how to configure the Keystone documentation for more detail on how to configure the
authtoken middleware. authtoken middleware.
In proxy-server.conf you will need to have the setting account In proxy-server.conf you will need to have the setting account
auto creation to true:: auto creation to true::
[app:proxy-server] account_autocreate = true [app:proxy-server]
account_autocreate = true
And add a swift authorization filter section, such as:: And add a swift authorization filter section, such as::
@@ -58,18 +59,18 @@ class KeystoneAuth(object):
This maps tenants to account in Swift. This maps tenants to account in Swift.
The user whose able to give ACL / create Containers permissions The user whose able to give ACL / create Containers permissions
will be the one that are inside the operator_roles will be the one that are inside the ``operator_roles``
setting which by default includes the admin and the swiftoperator setting which by default includes the admin and the swiftoperator
roles. roles.
If you need to have a different reseller_prefix to be able to If you need to have a different reseller_prefix to be able to
mix different auth servers you can configure the option mix different auth servers you can configure the option
reseller_prefix in your keystoneauth entry like this : ``reseller_prefix`` in your keystoneauth entry like this::
reseller_prefix = NEWAUTH_ reseller_prefix = NEWAUTH_
Make sure you have a underscore at the end of your new Make sure you have a underscore at the end of your new
reseller_prefix option. ``reseller_prefix`` option.
:param app: The next WSGI app in the pipeline :param app: The next WSGI app in the pipeline
:param conf: The dict of configuration values :param conf: The dict of configuration values