46c39f9581
This patch does the following: - updates the Master SHAs for new development work. - includes updates to policy, paste and rootwrap files as required - moves the Aodh repository to openstack_services as it now has implemented a stable branch - Updated the keystone-wsgi file as it was still running the code from liberty - add 2 package requirements to keystone which must be present for the new wsgi file. - updates tempest.conf.j2 to replace ssh_auth_method with auth_method, and change auth_method to 'keypair' (configured is no longer an a valid option) Change-Id: I933c24c03518865d9d40519dafb2ba46769a5453 Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
63 lines
1.9 KiB
Django/Jinja
63 lines
1.9 KiB
Django/Jinja
#############
|
|
# OpenStack #
|
|
#############
|
|
|
|
[composite:osapi_volume]
|
|
use = call:cinder.api:root_app_factory
|
|
/: apiversions
|
|
/v1: openstack_volume_api_v1
|
|
/v2: openstack_volume_api_v2
|
|
|
|
[composite:openstack_volume_api_v1]
|
|
use = call:cinder.api.middleware.auth:pipeline_factory
|
|
noauth = cors request_id faultwrap sizelimit osprofiler noauth apiv1
|
|
keystone = cors request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv1
|
|
keystone_nolimit = cors request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv1
|
|
|
|
[composite:openstack_volume_api_v2]
|
|
use = call:cinder.api.middleware.auth:pipeline_factory
|
|
noauth = cors request_id faultwrap sizelimit osprofiler noauth apiv2
|
|
keystone = cors request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv2
|
|
keystone_nolimit = cors request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv2
|
|
|
|
[filter:request_id]
|
|
paste.filter_factory = oslo_middleware.request_id:RequestId.factory
|
|
|
|
[filter:cors]
|
|
paste.filter_factory = oslo_middleware.cors:filter_factory
|
|
oslo_config_project = cinder
|
|
|
|
[filter:faultwrap]
|
|
paste.filter_factory = cinder.api.middleware.fault:FaultWrapper.factory
|
|
|
|
[filter:osprofiler]
|
|
paste.filter_factory = osprofiler.web:WsgiMiddleware.factory
|
|
|
|
[filter:noauth]
|
|
paste.filter_factory = cinder.api.middleware.auth:NoAuthMiddleware.factory
|
|
|
|
[filter:sizelimit]
|
|
paste.filter_factory = cinder.api.middleware.sizelimit:RequestBodySizeLimiter.factory
|
|
|
|
[app:apiv1]
|
|
paste.app_factory = cinder.api.v1.router:APIRouter.factory
|
|
|
|
[app:apiv2]
|
|
paste.app_factory = cinder.api.v2.router:APIRouter.factory
|
|
|
|
[pipeline:apiversions]
|
|
pipeline = cors faultwrap osvolumeversionapp
|
|
|
|
[app:osvolumeversionapp]
|
|
paste.app_factory = cinder.api.versions:Versions.factory
|
|
|
|
##########
|
|
# Shared #
|
|
##########
|
|
|
|
[filter:keystonecontext]
|
|
paste.filter_factory = cinder.api.middleware.auth:CinderKeystoneContext.factory
|
|
|
|
[filter:authtoken]
|
|
paste.filter_factory = keystonemiddleware.auth_token:filter_factory
|