Use keystonemiddleware and manila.conf for config

Switch to keystonemiddleware so a full keystoneclient installation is no
longer required.
Also move the configuration parameters for auth_token from api-paste.ini
to manila.conf. api-paste.ini configuration can still be used and take
priority over parameters from manila.conf.
Finally adjust devstack lib and use manila.conf to configure auth_token.

Related-Bug: #1240753
Change-Id: I4317ffca174a0f73dddc7030b367d49130040c77
This commit is contained in:
Thomas Bechtold
2014-11-13 09:01:48 +01:00
parent fad5e37e60
commit 73d867a12c
4 changed files with 11 additions and 19 deletions

View File

@@ -39,14 +39,4 @@ paste.app_factory = manila.api.versions:Versions.factory
paste.filter_factory = manila.api.middleware.auth:ManilaKeystoneContext.factory
[filter:authtoken]
paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
service_protocol = http
service_host = 127.0.0.1
service_port = 5000
auth_host = 127.0.0.1
auth_port = 35357
auth_protocol = http
admin_tenant_name = %SERVICE_TENANT_NAME%
admin_user = %SERVICE_USER%
admin_password = %SERVICE_PASSWORD%
signing_dir = /var/lib/manila
paste.filter_factory = keystonemiddleware.auth_token:filter_factory