openstack/devstack
Code Issues Proposed changes

Merge "Remove the kesytone admin token from swift"

Browse Source
This commit is contained in:
Jenkins 2015-03-12 15:22:29 +00:00 committed by Gerrit Code Review
commit 3d223fc2ce
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/swift
View File

@ -441,16 +441,15 @@ function configure_swift {
if is_service_enabled swift3; then if is_service_enabled swift3; then
cat <<EOF >>${SWIFT_CONFIG_PROXY_SERVER} cat <<EOF >>${SWIFT_CONFIG_PROXY_SERVER}
# NOTE(chmou): s3token middleware is not updated yet to use only
# username and password.
[filter:s3token] [filter:s3token]
paste.filter_factory = keystoneclient.middleware.s3_token:filter_factory paste.filter_factory = keystoneclient.middleware.s3_token:filter_factory
auth_port = ${KEYSTONE_AUTH_PORT} auth_port = ${KEYSTONE_AUTH_PORT}
auth_host = ${KEYSTONE_AUTH_HOST} auth_host = ${KEYSTONE_AUTH_HOST}
auth_protocol = ${KEYSTONE_AUTH_PROTOCOL} auth_protocol = ${KEYSTONE_AUTH_PROTOCOL}
cafile = ${SSL_BUNDLE_FILE} cafile = ${SSL_BUNDLE_FILE}
auth_token = ${SERVICE_TOKEN} admin_user = swift
admin_token = ${SERVICE_TOKEN} admin_tenant_name = ${SERVICE_TENANT_NAME}
admin_password = ${SERVICE_PASSWORD}
[filter:swift3] [filter:swift3]
use = egg:swift3#swift3 use = egg:swift3#swift3