diff options
| author | Zuul <zuul@review.openstack.org> | 2018-08-09 13:04:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-08-09 13:04:02 +0000 |
| commit | 9be1196df945fb1100f00eb961070b46782b2e08 (patch) | |
| tree | e753594bb3a322a3d2c3e009ea3038ad823b0621 | |
| parent | 9c7a56a38429bc9b8ec3f52d2af4702846eb959d (diff) | |
| parent | 98242af148a8b5471aa9093f888207665ca8696a (diff) | |
| download | heat-9be1196df945fb1100f00eb961070b46782b2e08.tar.gz | |
Merge "cors: update default configuration"
| -rw-r--r-- | heat/common/config.py | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/heat/common/config.py b/heat/common/config.py index e64d97061..40a23fcfa 100644 --- a/heat/common/config.py +++ b/heat/common/config.py @@ -540,23 +540,21 @@ def get_ssl_options(client): def set_config_defaults(): """This method updates all configuration default values.""" - # 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'] + ) |