openstack
/
murano
Code Issues Proposed changes

Merge "cors: update default configuration"

This commit is contained in:
Jenkins 2017-03-03 17:20:15 +00:00 committed by Gerrit Code Review
parent 9c7a7f27a4 3da434357b
commit f244908575
2 changed files with 39 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
murano/common/cf_config.py
View File

@ -53,24 +53,22 @@ def parse_args(args=None, usage=None, default_config_files=None):
def set_middleware_defaults(): def set_middleware_defaults():
"""Update default configuration options for oslo.middleware.""" """Update default configuration options for oslo.middleware."""
# CORS Defaults cors.set_defaults(
# TODO(krotscheck): Update with https://review.openstack.org/#/c/285368/ allow_headers=['X-Auth-Token',
cfg.set_defaults(cors.CORS_OPTS, 'X-Openstack-Request-Id',
allow_headers=['X-Auth-Token', 'X-Configuration-Session',
'X-Openstack-Request-Id', 'X-Roles',
'X-Configuration-Session', 'X-User-Id',
'X-Roles', 'X-Tenant-Id'],
'X-User-Id', expose_headers=['X-Auth-Token',
'X-Tenant-Id'], 'X-Openstack-Request-Id',
expose_headers=['X-Auth-Token', 'X-Configuration-Session',
'X-Openstack-Request-Id', 'X-Roles',
'X-Configuration-Session', 'X-User-Id',
'X-Roles', 'X-Tenant-Id'],
'X-User-Id', allow_methods=['GET',
'X-Tenant-Id'], 'PUT',
allow_methods=['GET', 'POST',
'PUT', 'DELETE',
'POST', 'PATCH']
'DELETE', )
'PATCH']
)

41
murano/common/config.py
View File

@ -351,24 +351,23 @@ def parse_args(args=None, usage=None, default_config_files=None):
def set_middleware_defaults(): def set_middleware_defaults():
"""Update default configuration options for oslo.middleware.""" """Update default configuration options for oslo.middleware."""
# CORS Defaults
# TODO(krotscheck): Update with https://review.openstack.org/#/c/285368/ cors.set_defaults(
cfg.set_defaults(cors.CORS_OPTS, allow_headers=['X-Auth-Token',
allow_headers=['X-Auth-Token', 'X-Openstack-Request-Id',
'X-Openstack-Request-Id', 'X-Configuration-Session',
'X-Configuration-Session', 'X-Roles',
'X-Roles', 'X-User-Id',
'X-User-Id', 'X-Tenant-Id'],
'X-Tenant-Id'], expose_headers=['X-Auth-Token',
expose_headers=['X-Auth-Token', 'X-Openstack-Request-Id',
'X-Openstack-Request-Id', 'X-Configuration-Session',
'X-Configuration-Session', 'X-Roles',
'X-Roles', 'X-User-Id',
'X-User-Id', 'X-Tenant-Id'],
'X-Tenant-Id'], allow_methods=['GET',
allow_methods=['GET', 'PUT',
'PUT', 'POST',
'POST', 'DELETE',
'DELETE', 'PATCH']
'PATCH'] )
)