diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-05-29 21:58:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-05-29 21:58:21 +0000 |
| commit | 1349e127356c6a25cb2e50008c8b925e5934676a (patch) | |
| tree | dd6e06109f21fba7ef5644220f45ac21c3d3ba4f /doc | |
| parent | b6dbb103e1c1779474c5d26f3acf47e704cc601c (diff) | |
| parent | 055d07380347cec2bff14383ed1434852f91336e (diff) | |
| download | keystone-1349e127356c6a25cb2e50008c8b925e5934676a.tar.gz keystone-1349e127356c6a25cb2e50008c8b925e5934676a.tar.xz keystone-1349e127356c6a25cb2e50008c8b925e5934676a.zip | |
Merge "Update swift_auth documentation."
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/source/configuringservices.rst | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/doc/source/configuringservices.rst b/doc/source/configuringservices.rst index 7e56adb4..5410ffc7 100644 --- a/doc/source/configuringservices.rst +++ b/doc/source/configuringservices.rst @@ -238,7 +238,7 @@ rather than its built in 'tempauth'. Configuring Swift with S3 emulation to use Keystone --------------------------------------------------- -Keystone support validating S3 tokens using the same tokens as the +Keystone supports validating S3 tokens using the same tokens as the 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. @@ -247,7 +247,7 @@ S3 api. (`/etc/swift/swift-proxy.conf` to use S3token and Swift3 middleware. - Here's an example:: + Here's an example that by default communicates with keystone via https :: [DEFAULT] bind_port = 8080 @@ -278,15 +278,17 @@ S3 api. [filter:s3token] paste.filter_factory = keystone.middleware.s3_token:filter_factory + # uncomment the following line if you don't want to use SSL + # auth_protocol = http auth_port = 35357 auth_host = 127.0.0.1 - auth_protocol = http [filter:authtoken] paste.filter_factory = keystone.middleware.auth_token:filter_factory + # uncomment the following line if you don't want to use SSL + # auth_protocol = http auth_port = 35357 auth_host = 127.0.0.1 - auth_protocol = http auth_token = ADMIN admin_token = ADMIN |