diff --git a/cloudkitty/common/defaults.py b/cloudkitty/common/defaults.py index 534eb58b..1fc69893 100644 --- a/cloudkitty/common/defaults.py +++ b/cloudkitty/common/defaults.py @@ -13,7 +13,6 @@ # under the License. # -from oslo_config import cfg from oslo_middleware import cors @@ -24,23 +23,20 @@ def set_config_defaults(): def set_cors_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-Identity-Status', - 'X-Roles', - 'X-Service-Catalog', - 'X-User-Id', - 'X-Tenant-Id', - 'X-OpenStack-Request-ID'], - expose_headers=['X-Auth-Token', - 'X-Subject-Token', - 'X-Service-Token', - 'X-OpenStack-Request-ID'], - allow_methods=['GET', - 'PUT', - 'POST', - 'DELETE', - 'PATCH'] - ) + cors.set_defaults( + allow_headers=['X-Auth-Token', + 'X-Identity-Status', + 'X-Roles', + 'X-Service-Catalog', + 'X-User-Id', + 'X-Tenant-Id', + 'X-OpenStack-Request-ID'], + expose_headers=['X-Auth-Token', + 'X-Subject-Token', + 'X-Service-Token', + 'X-OpenStack-Request-ID'], + allow_methods=['GET', + 'PUT', + 'POST', + 'DELETE', + 'PATCH']) diff --git a/requirements.txt b/requirements.txt index ef15c22f..36fbf12f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,7 +21,7 @@ oslo.db>=4.1.0 # Apache-2.0 oslo.i18n>=2.1.0 # Apache-2.0 oslo.log>=1.14.0 # Apache-2.0 oslo.messaging!=5.25.0,>=5.24.2 # Apache-2.0 -oslo.middleware>=3.0.0 # Apache-2.0 +oslo.middleware>=3.27.0 # Apache-2.0 oslo.policy>=0.5.0 # Apache-2.0 oslo.utils>=3.5.0 # Apache-2.0 SQLAlchemy<1.1.0,>=1.0.10 # MIT