Browse code
Update glance pipelines to use context middleware
* Glance no longer depends on keystone.middleware.glance_auth_token
Change-Id: Ie634a007f710792eda810e479fae463c158ebc5f
Brian Waldon authored on 2012/03/19 23:54:16Showing 2 changed files
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
[pipeline:glance-api] |
| 2 | 2 |
#pipeline = versionnegotiation context apiv1app |
| 3 | 3 |
# NOTE: use the following pipeline for keystone |
| 4 |
-pipeline = versionnegotiation authtoken auth-context apiv1app |
|
| 4 |
+pipeline = versionnegotiation authtoken context apiv1app |
|
| 5 | 5 |
|
| 6 | 6 |
# To enable Image Cache Management API replace pipeline with below: |
| 7 | 7 |
# pipeline = versionnegotiation context imagecache apiv1app |
| ... | ... |
@@ -38,12 +38,6 @@ auth_host = %KEYSTONE_AUTH_HOST% |
| 38 | 38 |
auth_port = %KEYSTONE_AUTH_PORT% |
| 39 | 39 |
auth_protocol = %KEYSTONE_AUTH_PROTOCOL% |
| 40 | 40 |
auth_uri = %KEYSTONE_SERVICE_PROTOCOL%://%KEYSTONE_SERVICE_HOST%:%KEYSTONE_SERVICE_PORT%/ |
| 41 |
-# FIXME(dtroyer): remove admin_token after auth_token is updated |
|
| 42 |
-admin_token = %SERVICE_TOKEN% |
|
| 43 | 41 |
admin_tenant_name = %SERVICE_TENANT_NAME% |
| 44 | 42 |
admin_user = %SERVICE_USERNAME% |
| 45 | 43 |
admin_password = %SERVICE_PASSWORD% |
| 46 |
- |
|
| 47 |
-[filter:auth-context] |
|
| 48 |
-paste.filter_factory = glance.common.wsgi:filter_factory |
|
| 49 |
-glance.filter_factory = keystone.middleware.glance_auth_token:KeystoneContextMiddleware |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
[pipeline:glance-registry] |
| 2 | 2 |
#pipeline = context registryapp |
| 3 | 3 |
# NOTE: use the following pipeline for keystone |
| 4 |
-pipeline = authtoken auth-context context registryapp |
|
| 4 |
+pipeline = authtoken context registryapp |
|
| 5 | 5 |
|
| 6 | 6 |
[app:registryapp] |
| 7 | 7 |
paste.app_factory = glance.common.wsgi:app_factory |
| ... | ... |
@@ -22,13 +22,6 @@ auth_host = %KEYSTONE_AUTH_HOST% |
| 22 | 22 |
auth_port = %KEYSTONE_AUTH_PORT% |
| 23 | 23 |
auth_protocol = %KEYSTONE_AUTH_PROTOCOL% |
| 24 | 24 |
auth_uri = %KEYSTONE_SERVICE_PROTOCOL%://%KEYSTONE_SERVICE_HOST%:%KEYSTONE_SERVICE_PORT%/ |
| 25 |
-# FIXME(dtroyer): remove admin_token after auth_token is updated |
|
| 26 |
-admin_token = %SERVICE_TOKEN% |
|
| 27 | 25 |
admin_tenant_name = %SERVICE_TENANT_NAME% |
| 28 | 26 |
admin_user = %SERVICE_USERNAME% |
| 29 | 27 |
admin_password = %SERVICE_PASSWORD% |
| 30 |
- |
|
| 31 |
-[filter:auth-context] |
|
| 32 |
-context_class = glance.registry.context.RequestContext |
|
| 33 |
-paste.filter_factory = glance.common.wsgi:filter_factory |
|
| 34 |
-glance.filter_factory = keystone.middleware.glance_auth_token:KeystoneContextMiddleware |