From 6ac97deba6af9ced38f3c0ec93327d352e20c6df Mon Sep 17 00:00:00 2001 From: Jamie Lennox Date: Thu, 12 Mar 2015 09:03:28 +1100 Subject: [PATCH] Swift use v3 auth_token credentials The keystonemiddleware 1.5.0 released 2015-03-11 supports configuring auth plugins from the paste config file. This means that swift can now use authentication plugins for auth_token middleware. Change-Id: Icb9f008a57b6f75e0506cbecd0a1e0f28b7dadda --- lib/swift | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/lib/swift b/lib/swift index 8a96615d01..f291d872d4 100644 --- a/lib/swift +++ b/lib/swift @@ -415,16 +415,8 @@ function configure_swift { # IDs will included in all of its log messages. iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:authtoken log_name swift - # NOTE(jamielennox): swift cannot use the regular configure_auth_token_middleware function because swift - # doesn't use oslo.config which is the only way to configure auth plugins with the middleare. iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:authtoken paste.filter_factory keystonemiddleware.auth_token:filter_factory - iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:authtoken identity_uri $KEYSTONE_AUTH_URI - iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:authtoken admin_user swift - iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:authtoken admin_password $SERVICE_PASSWORD - iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:authtoken admin_tenant_name $SERVICE_TENANT_NAME - iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:authtoken auth_uri $KEYSTONE_SERVICE_URI - iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:authtoken cafile $SSL_BUNDLE_FILE - iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:authtoken signing_dir $SWIFT_AUTH_CACHE_DIR + configure_auth_token_middleware $SWIFT_CONFIG_PROXY_SERVER swift $SWIFT_AUTH_CACHE_DIR filter:authtoken iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:authtoken delay_auth_decision 1 iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:authtoken cache swift.cache iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:authtoken include_service_catalog False