From 60fb12813be4df638c7d637162c3d14950908cbe Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Tue, 30 Jan 2018 08:19:34 +0000 Subject: [PATCH] Update paste, policy and rootwrap configurations 2018-01-30 Change-Id: I11bf59b4ff6df75b24285cac86bcb7e90838063e --- templates/api-paste.ini.j2 | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/templates/api-paste.ini.j2 b/templates/api-paste.ini.j2 index 75fb01d..b00a5ad 100644 --- a/templates/api-paste.ini.j2 +++ b/templates/api-paste.ini.j2 @@ -1,16 +1,16 @@ [pipeline:sahara] -pipeline = cors http_proxy_to_wsgi request_id acl auth_validator sahara_api +pipeline = cors http_proxy_to_wsgi request_id versions acl auth_validator sahara_api [composite:sahara_api] use = egg:Paste#urlmap -/: sahara_apiv11 +/: sahara_apiv2 -[app:sahara_apiv11] -paste.app_factory = sahara.api.middleware.sahara_middleware:Router.factory +# this app is given as a reference for v1-only deployments +# [app:sahara_apiv11] +# paste.app_factory = sahara.api.middleware.sahara_middleware:Router.factory -# this app is only for use with the experimental v2 API -# [app:sahara_apiv2] -# paste.app_factory = sahara.api.middleware.sahara_middleware:RouterV2.factory +[app:sahara_apiv2] +paste.app_factory = sahara.api.middleware.sahara_middleware:RouterV2.factory [filter:cors] paste.filter_factory = oslo_middleware.cors:filter_factory @@ -25,12 +25,15 @@ paste.filter_factory = keystonemiddleware.auth_token:filter_factory [filter:auth_validator] paste.filter_factory = sahara.api.middleware.auth_valid:AuthValidator.factory -# this filter is only for use with the experimental v2 API -# [filter:auth_validator_v2] -# paste.filter_factory = sahara.api.middleware.auth_valid:AuthValidatorV2.factory - [filter:debug] paste.filter_factory = oslo_middleware.debug:Debug.factory [filter:http_proxy_to_wsgi] paste.filter_factory = oslo_middleware:HTTPProxyToWSGI.factory + +[filter:versions] +paste.filter_factory = sahara.api.middleware.version_discovery:VersionResponseMiddlewareV2.factory + +# this filter is given as a reference for v1-only deployments +#[filter:versions] +#paste.filter_factory = sahara.api.middleware.version_discovery:VersionResponseMiddlewareV1.factory