From ed59f6bd1a8089724d76f1554e2f242c11f3056c Mon Sep 17 00:00:00 2001
From: Li Wei <wei.li@easystack.cn>
Date: Fri, 4 Nov 2016 11:09:53 +0800
Subject: [PATCH] Use cors.set_defaults instead of cfg.set_defaults
Cors has been added setdefaults method, just use it.
Related link:
https://review.openstack.org/#/c/285368/
Change-Id: I26e1ecdf4a92ab55eeb794a0df7ba6a323f9141a
---
manila/common/config.py | 46 ++++++++++++++++++++---------------------
1 file changed, 22 insertions(+), 24 deletions(-)
diff --git a/manila/common/config.py b/manila/common/config.py
index 130a276d4a..8d4e80cf5c 100644
--- a/manila/common/config.py
+++ b/manila/common/config.py
@@ -188,27 +188,25 @@ def verify_share_protocols():
def set_middleware_defaults():
"""Update default configuration options for oslo.middleware."""
- # CORS Defaults
- # TODO(krotscheck): Update with https://review.openstack.org/#/c/285368/
- cfg.set_defaults(cors.CORS_OPTS,
- allow_headers=['X-Auth-Token',
- 'X-OpenStack-Request-ID',
- 'X-Openstack-Manila-Api-Version',
- 'X-OpenStack-Manila-API-Experimental',
- 'X-Identity-Status',
- 'X-Roles',
- 'X-Service-Catalog',
- 'X-User-Id',
- 'X-Tenant-Id'],
- expose_headers=['X-Auth-Token',
- 'X-OpenStack-Request-ID',
- 'X-Openstack-Manila-Api-Version',
- 'X-OpenStack-Manila-API-Experimental',
- 'X-Subject-Token',
- 'X-Service-Token'],
- allow_methods=['GET',
- 'PUT',
- 'POST',
- 'DELETE',
- 'PATCH']
- )
+ cors.set_defaults(
+ allow_headers=['X-Auth-Token',
+ 'X-OpenStack-Request-ID',
+ 'X-Openstack-Manila-Api-Version',
+ 'X-OpenStack-Manila-API-Experimental',
+ 'X-Identity-Status',
+ 'X-Roles',
+ 'X-Service-Catalog',
+ 'X-User-Id',
+ 'X-Tenant-Id'],
+ expose_headers=['X-Auth-Token',
+ 'X-OpenStack-Request-ID',
+ 'X-Openstack-Manila-Api-Version',
+ 'X-OpenStack-Manila-API-Experimental',
+ 'X-Subject-Token',
+ 'X-Service-Token'],
+ allow_methods=['GET',
+ 'PUT',
+ 'POST',
+ 'DELETE',
+ 'PATCH']
+ )