From c72d133d19f266b8441ad7e1c19204ed79c72960 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Thu, 2 Jun 2016 19:07:51 +0100 Subject: [PATCH] Update paste, policy and rootwrap configurations 2016-06-02 Change-Id: I50b494d3eeaac26628f2076d88aa1534c9a15e83 --- files/rootwrap.d/volume.filters | 2 +- templates/api-paste.ini.j2 | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/files/rootwrap.d/volume.filters b/files/rootwrap.d/volume.filters index 27971397..c4083cbb 100644 --- a/files/rootwrap.d/volume.filters +++ b/files/rootwrap.d/volume.filters @@ -151,7 +151,7 @@ mmdelsnapshot: CommandFilter, /usr/lpp/mmfs/bin/mmdelsnapshot, root # cinder/volume/drivers/ibm/gpfs.py # cinder/volume/drivers/ibm/ibmnas.py -find_maxdepth_inum: RegExpFilter, find, root, find, ^[/]*([^/\0]+(/+)?)*$, -maxdepth, \d+, -inum, \d+ +find_maxdepth_inum: RegExpFilter, find, root, find, ^[/]*([^/\0]+(/+)?)*$, -maxdepth, \d+, -ignore_readdir_race, -inum, \d+, -print0, -quit # cinder/brick/initiator/connector.py: aoe-revalidate: CommandFilter, aoe-revalidate, root diff --git a/templates/api-paste.ini.j2 b/templates/api-paste.ini.j2 index f4c507f9..69a7d6b1 100644 --- a/templates/api-paste.ini.j2 +++ b/templates/api-paste.ini.j2 @@ -11,25 +11,28 @@ use = call:cinder.api:root_app_factory [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 +noauth = cors http_proxy_to_wsgi request_id faultwrap sizelimit osprofiler noauth apiv1 +keystone = cors http_proxy_to_wsgi request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv1 +keystone_nolimit = cors http_proxy_to_wsgi 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 +noauth = cors http_proxy_to_wsgi request_id faultwrap sizelimit osprofiler noauth apiv2 +keystone = cors http_proxy_to_wsgi request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv2 +keystone_nolimit = cors http_proxy_to_wsgi request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv2 [composite:openstack_volume_api_v3] use = call:cinder.api.middleware.auth:pipeline_factory -noauth = cors request_id faultwrap sizelimit osprofiler noauth apiv3 -keystone = cors request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv3 -keystone_nolimit = cors request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv3 +noauth = cors http_proxy_to_wsgi request_id faultwrap sizelimit osprofiler noauth apiv3 +keystone = cors http_proxy_to_wsgi request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv3 +keystone_nolimit = cors http_proxy_to_wsgi request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv3 [filter:request_id] paste.filter_factory = oslo_middleware.request_id:RequestId.factory +[filter:http_proxy_to_wsgi] +paste.filter_factory = oslo_middleware.http_proxy_to_wsgi:HTTPProxyToWSGI.factory + [filter:cors] paste.filter_factory = oslo_middleware.cors:filter_factory oslo_config_project = cinder @@ -56,7 +59,7 @@ paste.app_factory = cinder.api.v2.router:APIRouter.factory paste.app_factory = cinder.api.v3.router:APIRouter.factory [pipeline:apiversions] -pipeline = cors faultwrap osvolumeversionapp +pipeline = cors http_proxy_to_wsgi faultwrap osvolumeversionapp [app:osvolumeversionapp] paste.app_factory = cinder.api.versions:Versions.factory