openstack/glance
Code Issues Proposed changes

Update paste config files with keystone examples.

Browse Source 
see ticket: lp839559

Change-Id: Ie5d5011a601962bcc79cf69ef8db11029fcb866e
This commit is contained in:
Dan Prince 2011-09-02 09:32:01 -04:00
parent 09ea2718a2
commit 22d7864a41
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
etc/glance-api.conf
View File

@ -133,9 +133,13 @@ delayed_delete = False
[pipeline:glance-api] [pipeline:glance-api]
pipeline = versionnegotiation context apiv1app pipeline = versionnegotiation context apiv1app
# NOTE: use the following pipeline for keystone
# 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 imagecache apiv1app # pipeline = versionnegotiation context imagecache apiv1app
# NOTE: use the following pipeline for keystone auth (with caching)
# pipeline = versionnegotiation authtoken context imagecache apiv1app
[pipeline:versions] [pipeline:versions]
pipeline = versionsapp pipeline = versionsapp
@ -154,3 +158,14 @@ paste.filter_factory = glance.api.middleware.image_cache:filter_factory
[filter:context] [filter:context]
paste.filter_factory = glance.common.context:filter_factory paste.filter_factory = glance.common.context:filter_factory
[filter:authtoken]
paste.filter_factory = keystone.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 = 5001
auth_protocol = http
auth_uri = http://127.0.0.1:5000/
admin_token = 999888777666

16
etc/glance-registry.conf
View File

@ -42,6 +42,8 @@ limit_param_default = 25
[pipeline:glance-registry] [pipeline:glance-registry]
pipeline = context registryapp pipeline = context registryapp
# NOTE: use the following pipeline for keystone
# pipeline = authtoken keystone_shim context registryapp
[app:registryapp] [app:registryapp]
paste.app_factory = glance.registry.server:app_factory paste.app_factory = glance.registry.server:app_factory
@ -49,3 +51,17 @@ paste.app_factory = glance.registry.server:app_factory
[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.context:filter_factory
[filter:authtoken]
paste.filter_factory = keystone.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 = 5001
auth_protocol = http
auth_uri = http://127.0.0.1:5000/
admin_token = 999888777666
[filter:keystone_shim]
paste.filter_factory = keystone.middleware.glance_auth_token:filter_factory