openstack
/
keystone
Code Issues Proposed changes

Merge "Updating example glance paste config." into milestone-proposed

This commit is contained in:
Jenkins 2012-01-25 23:13:08 +00:00 committed by Gerrit Code Review
parent 44075e145f 2f554c45d6
commit fbd1af73eb
5 changed files with 105 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -7,6 +7,7 @@ Dan Prince <dan.prince@rackspace.com>
Dolph Mathews <dolph.mathews@gmail.com>
Ed Leafe <ed@leafe.com>
Edouard Thuleau <edouard1.thuleau@orange.com>
Eoghan Glynn <eglynn@redhat.com>
gholt <gholt@brim.net>
jabdul <abdulkader.j@hcl.com>
James E. Blair <jeblair@hp.com>

60
examples/paste/glance-api-paste.ini Normal file
View File

@ -0,0 +1,60 @@
#[pipeline:glance-api]
#pipeline = versionnegotiation authtoken context apiv1app
# Default minimal pipeline
[pipeline:glance-api]
pipeline = versionnegotiation context apiv1app
# Use the following pipeline for keystone auth
# i.e. in glance-api.conf:
# [paste_deploy]
# flavor = keystone
#
[pipeline:glance-api-keystone]
pipeline = versionnegotiation authtoken auth-context apiv1app
#[pipeline:versions]
#pipeline = versionsapp
#[app:versionsapp]
#paste.app_factory = glance.api.versions:app_factory
#[app:apiv1app]
#paste.app_factory = glance.api.v1:app_factory
[app:apiv1app]
paste.app_factory = glance.common.wsgi:app_factory
glance.app_factory = glance.api.v1.router:API
#[filter:versionnegotiation]
#paste.filter_factory = glance.api.middleware.version_negotiation:filter_factory
[filter:versionnegotiation]
paste.filter_factory = glance.common.wsgi:filter_factory
glance.filter_factory = glance.api.middleware.version_negotiation:VersionNegotiationFilter
#[filter:imagecache]
#paste.filter_factory = glance.api.middleware.image_cache:filter_factory
#[filter:context]
#paste.filter_factory = glance.common.context:filter_factory
[filter:context]
paste.filter_factory = glance.common.wsgi:filter_factory
glance.filter_factory = glance.common.context:ContextMiddleware
[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 = 35357
auth_protocol = http
auth_uri = http://127.0.0.1:5000/
admin_token = 999888777666
auth_timeout = 30
[filter:auth-context]
paste.filter_factory = glance.common.wsgi:filter_factory
glance.filter_factory = keystone.middleware.glance_auth_token:KeystoneContextMiddleware

38
examples/paste/glance-api.conf
View File

@ -131,38 +131,8 @@ image_cache_stall_timeout = 86400
# Turn on/off delayed delete
delayed_delete = False
[pipeline:glance-api]
pipeline = versionnegotiation authtoken context apiv1app
# ============ Paste Deploy Options ===============================
# To enable Image Cache Management API replace pipeline with below:
# pipeline = versionnegotiation authtoken context imagecache apiv1app
[pipeline:versions]
pipeline = versionsapp
[app:versionsapp]
paste.app_factory = glance.api.versions:app_factory
[app:apiv1app]
paste.app_factory = glance.api.v1:app_factory
[filter:versionnegotiation]
paste.filter_factory = glance.api.middleware.version_negotiation:filter_factory
[filter:imagecache]
paste.filter_factory = glance.api.middleware.image_cache:filter_factory
[filter:context]
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 = 35357
auth_protocol = http
auth_uri = http://127.0.0.1:5000/
admin_token = 999888777666
auth_timeout = 30
# Select the keystone deployment flavor
[paste_deploy]
flavor = keystone

37
examples/paste/glance-registry-paste.ini Normal file
View File

@ -0,0 +1,37 @@
# Default minimal pipeline
[pipeline:glance-registry]
pipeline = context registryapp
# Use the following pipeline for keystone auth
# i.e. in glance-registry.conf:
# [paste_deploy]
# flavor = keystone
#
[pipeline:glance-registry-keystone]
pipeline = authtoken auth-context registryapp
[app:registryapp]
paste.app_factory = glance.common.wsgi:app_factory
glance.app_factory = glance.registry.api.v1:API
[filter:context]
context_class = glance.registry.context.RequestContext
paste.filter_factory = glance.common.wsgi:filter_factory
glance.filter_factory = glance.common.context:ContextMiddleware
[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 = 35357
auth_protocol = http
auth_uri = http://127.0.0.1:5000/
admin_token = 999888777666
auth_timeout = 30
[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

27
examples/paste/glance-registry.conf
View File

@ -40,27 +40,6 @@ api_limit_max = 1000
# default to `limit_param_default`
limit_param_default = 25
[pipeline:glance-registry]
pipeline = authtoken keystone_shim context registryapp
[app:registryapp]
paste.app_factory = glance.registry.server:app_factory
[filter:context]
context_class = glance.registry.context.RequestContext
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 = 35357
auth_protocol = http
auth_uri = http://127.0.0.1:5000/
admin_token = 999888777666
auth_timeout = 30
[filter:keystone_shim]
paste.filter_factory = keystone.middleware.glance_auth_token:filter_factory
# Select the keystone deployment flavor
[paste_deploy]
flavor = keystone