summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-03-20 04:49:56 +0000
committerGerrit Code Review <review@openstack.org>2012-03-20 04:49:56 +0000
commit632fb0a8cb4eddf76ce0695472601d69115149a9 (patch)
tree80acb2d3547d7b5d9fd4b212038d8f2556eeab36 /doc
parent4f3dade2367270442b685426befd6d6de665797b (diff)
parent2324247baac2ba620da1f6cdc540462e6f0b6a5f (diff)
downloadkeystone-632fb0a8cb4eddf76ce0695472601d69115149a9.tar.gz
keystone-632fb0a8cb4eddf76ce0695472601d69115149a9.tar.xz
keystone-632fb0a8cb4eddf76ce0695472601d69115149a9.zip
Merge "Swift middleware doc update."
Diffstat (limited to 'doc')
-rw-r--r--doc/source/configuringservices.rst13
1 files changed, 8 insertions, 5 deletions
diff --git a/doc/source/configuringservices.rst b/doc/source/configuringservices.rst
index 0faa00ca..b8911570 100644
--- a/doc/source/configuringservices.rst
+++ b/doc/source/configuringservices.rst
@@ -171,13 +171,17 @@ rather than it's built in 'tempauth'.
5. Verify that keystone is providing authentication to Swift
- $ swift -V 2 -A http://localhost:5000/v2.0/tokens -U admin:admin -K ADMIN stat
+ $ swift -V 2 -A http://localhost:5000/v2.0 -U admin:admin -K ADMIN stat
-Configuring Swift with S3 emuluation to use Keystone
-----------------------------------------------------
+.. NOTE::
+ Instead of connecting to Swift here, as you would with other services, we
+ are connecting directly to Keystone.
+
+Configuring Swift with S3 emulation to use Keystone
+---------------------------------------------------
Keystone support validating S3 tokens using the same tokens as the
-generated EC2 tokens. After you have generated a pair of EC2 access
+generated EC2 tokens. When you have generated a pair of EC2 access
token and secret you can access your swift cluster directly with the
S3 api.
@@ -220,7 +224,6 @@ 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