diff options
| author | Chmouel Boudjnah <chmouel@chmouel.com> | 2012-03-21 16:59:15 +0000 |
|---|---|---|
| committer | Chmouel Boudjnah <chmouel@chmouel.com> | 2012-03-23 05:28:43 +0000 |
| commit | 7abe0aa3845459b95a7d4e401e51d4ab8c4c0280 (patch) | |
| tree | e2820e23a5d8a7002d4395d2be6acee393ed411c /doc/source | |
| parent | 9feb00085f75ea2697fd2225e6003c2384904d08 (diff) | |
S3 tokens cleanups.
- Cleanups.
- Remove reference about config admin_username/password/token.
- Return proper http error on errors.
- Add unittests (skip them for now when swift is not installed).
- Fixes bug 956983.
Change-Id: I392fc274f3b01a5a0b5779dd13f9cd3b819ee65a
Diffstat (limited to 'doc/source')
| -rw-r--r-- | doc/source/configuringservices.rst | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/doc/source/configuringservices.rst b/doc/source/configuringservices.rst index 8cd5eb80..bc89b2ca 100644 --- a/doc/source/configuringservices.rst +++ b/doc/source/configuringservices.rst @@ -220,12 +220,9 @@ S3 api. [filter:s3token] paste.filter_factory = keystone.middleware.s3_token:filter_factory - service_port = 5000 - service_host = 127.0.0.1 auth_port = 35357 auth_host = 127.0.0.1 - auth_token = ADMIN - admin_token = ADMIN + auth_protocol = http [filter:authtoken] paste.filter_factory = keystone.middleware.auth_token:filter_factory @@ -233,6 +230,7 @@ S3 api. service_host = 127.0.0.1 auth_port = 35357 auth_host = 127.0.0.1 + auth_protocol = http auth_token = ADMIN admin_token = ADMIN |