openstack/devstack
Code Issues Proposed changes

Update glance pipelines to use context middleware

Browse Source 
* Glance no longer depends on keystone.middleware.glance_auth_token

Change-Id: Ie634a007f710792eda810e479fae463c158ebc5f
This commit is contained in:
Brian Waldon 2012-03-19 07:54:16 -07:00
parent 09407d90a8
commit 6aef757432
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
files/glance-api-paste.ini
View File

@ -1,7 +1,7 @@
[pipeline:glance-api] [pipeline:glance-api]
#pipeline = versionnegotiation context apiv1app #pipeline = versionnegotiation context apiv1app
# NOTE: use the following pipeline for keystone # NOTE: use the following pipeline for keystone
pipeline = versionnegotiation authtoken auth-context apiv1app pipeline = versionnegotiation authtoken context apiv1app
# To enable Image Cache Management API replace pipeline with below: # To enable Image Cache Management API replace pipeline with below:
# pipeline = versionnegotiation context imagecache apiv1app # pipeline = versionnegotiation context imagecache apiv1app
@ -38,12 +38,6 @@ auth_host = %KEYSTONE_AUTH_HOST%
auth_port = %KEYSTONE_AUTH_PORT% auth_port = %KEYSTONE_AUTH_PORT%
auth_protocol = %KEYSTONE_AUTH_PROTOCOL% auth_protocol = %KEYSTONE_AUTH_PROTOCOL%
auth_uri = %KEYSTONE_SERVICE_PROTOCOL%://%KEYSTONE_SERVICE_HOST%:%KEYSTONE_SERVICE_PORT%/ auth_uri = %KEYSTONE_SERVICE_PROTOCOL%://%KEYSTONE_SERVICE_HOST%:%KEYSTONE_SERVICE_PORT%/
# FIXME(dtroyer): remove admin_token after auth_token is updated
admin_token = %SERVICE_TOKEN%
admin_tenant_name = %SERVICE_TENANT_NAME% admin_tenant_name = %SERVICE_TENANT_NAME%
admin_user = %SERVICE_USERNAME% admin_user = %SERVICE_USERNAME%
admin_password = %SERVICE_PASSWORD% admin_password = %SERVICE_PASSWORD%
[filter:auth-context]
paste.filter_factory = glance.common.wsgi:filter_factory
glance.filter_factory = keystone.middleware.glance_auth_token:KeystoneContextMiddleware

9
files/glance-registry-paste.ini
View File

@ -1,7 +1,7 @@
[pipeline:glance-registry] [pipeline:glance-registry]
#pipeline = context registryapp #pipeline = context registryapp
# NOTE: use the following pipeline for keystone # NOTE: use the following pipeline for keystone
pipeline = authtoken auth-context context registryapp pipeline = authtoken context registryapp
[app:registryapp] [app:registryapp]
paste.app_factory = glance.common.wsgi:app_factory paste.app_factory = glance.common.wsgi:app_factory
@ -22,13 +22,6 @@ auth_host = %KEYSTONE_AUTH_HOST%
auth_port = %KEYSTONE_AUTH_PORT% auth_port = %KEYSTONE_AUTH_PORT%
auth_protocol = %KEYSTONE_AUTH_PROTOCOL% auth_protocol = %KEYSTONE_AUTH_PROTOCOL%
auth_uri = %KEYSTONE_SERVICE_PROTOCOL%://%KEYSTONE_SERVICE_HOST%:%KEYSTONE_SERVICE_PORT%/ auth_uri = %KEYSTONE_SERVICE_PROTOCOL%://%KEYSTONE_SERVICE_HOST%:%KEYSTONE_SERVICE_PORT%/
# FIXME(dtroyer): remove admin_token after auth_token is updated
admin_token = %SERVICE_TOKEN%
admin_tenant_name = %SERVICE_TENANT_NAME% admin_tenant_name = %SERVICE_TENANT_NAME%
admin_user = %SERVICE_USERNAME% admin_user = %SERVICE_USERNAME%
admin_password = %SERVICE_PASSWORD% admin_password = %SERVICE_PASSWORD%
[filter:auth-context]
context_class = glance.registry.context.RequestContext
paste.filter_factory = glance.common.wsgi:filter_factory
glance.filter_factory = keystone.middleware.glance_auth_token:KeystoneContextMiddleware