openstack/devstack
Code Issues Proposed changes

Update glance config files for https://review.openstack.org/#change,2139

Browse Source 
Change-Id: I61d10508282ebbc1a1910f1723b25f360068f366
This commit is contained in:
Dean Troyer 2011-12-14 15:52:02 -06:00
parent e46f889167
commit cebdd8fcff
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
files/glance-api.conf
View File

@ -141,30 +141,32 @@ scrubber_datadir = /var/lib/glance/scrubber
[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 context apiv1app pipeline = versionnegotiation authtoken auth-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
# NOTE: use the following pipeline for keystone auth (with caching) # NOTE: use the following pipeline for keystone auth (with caching)
# pipeline = versionnegotiation authtoken context imagecache apiv1app # pipeline = versionnegotiation authtoken auth-context imagecache apiv1app
[pipeline:versions]
pipeline = versionsapp
[app:versionsapp]
paste.app_factory = glance.api.versions:app_factory
[app:apiv1app] [app:apiv1app]
paste.app_factory = glance.api.v1.router:app_factory paste.app_factory = glance.common.wsgi:app_factory
glance.app_factory = glance.api.v1.router:API
[filter:versionnegotiation] [filter:versionnegotiation]
paste.filter_factory = glance.api.middleware.version_negotiation:filter_factory paste.filter_factory = glance.common.wsgi:filter_factory
glance.filter_factory = glance.api.middleware.version_negotiation:VersionNegotiationFilter
[filter:imagecache] [filter:cache]
paste.filter_factory = glance.api.middleware.image_cache:filter_factory paste.filter_factory = glance.common.wsgi:filter_factory
glance.filter_factory = glance.api.middleware.cache:CacheFilter
[filter:cachemanage]
paste.filter_factory = glance.common.wsgi:filter_factory
glance.filter_factory = glance.api.middleware.cache_manage:CacheManageFilter
[filter:context] [filter:context]
paste.filter_factory = glance.common.context:filter_factory paste.filter_factory = glance.common.wsgi:filter_factory
glance.filter_factory = glance.common.context:ContextMiddleware
[filter:authtoken] [filter:authtoken]
paste.filter_factory = keystone.middleware.auth_token:filter_factory paste.filter_factory = keystone.middleware.auth_token:filter_factory
@ -176,3 +178,7 @@ auth_port = 35357
auth_protocol = http auth_protocol = http
auth_uri = http://127.0.0.1:5000/ auth_uri = http://127.0.0.1:5000/
admin_token = %SERVICE_TOKEN% admin_token = %SERVICE_TOKEN%
[filter:auth-context]
paste.filter_factory = glance.common.wsgi:filter_factory
glance.filter_factory = keystone.middleware.glance_auth_token:KeystoneContextMiddleware

14
files/glance-registry.conf
View File

@ -46,14 +46,16 @@ limit_param_default = 25
[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 keystone_shim context registryapp pipeline = authtoken auth-context context registryapp
[app:registryapp] [app:registryapp]
paste.app_factory = glance.registry.server:app_factory paste.app_factory = glance.common.wsgi:app_factory
glance.app_factory = glance.registry.api.v1:API
[filter:context] [filter:context]
context_class = glance.registry.context.RequestContext context_class = glance.registry.context.RequestContext
paste.filter_factory = glance.common.context:filter_factory paste.filter_factory = glance.common.wsgi:filter_factory
glance.filter_factory = glance.common.context:ContextMiddleware
[filter:authtoken] [filter:authtoken]
paste.filter_factory = keystone.middleware.auth_token:filter_factory paste.filter_factory = keystone.middleware.auth_token:filter_factory
@ -66,5 +68,7 @@ auth_protocol = http
auth_uri = http://127.0.0.1:5000/ auth_uri = http://127.0.0.1:5000/
admin_token = %SERVICE_TOKEN% admin_token = %SERVICE_TOKEN%
[filter:keystone_shim] [filter:auth-context]
paste.filter_factory = keystone.middleware.glance_auth_token:filter_factory context_class = glance.registry.context.RequestContext
paste.filter_factory = glance.common.wsgi:filter_factory
glance.filter_factory = keystone.middleware.glance_auth_token:KeystoneContextMiddleware