Merge "Moved CORS middleware configuration into oslo-config-generator"
This commit is contained in:
commit
8bcc7bddaf
|
@ -0,0 +1,40 @@
|
||||||
|
# Copyright 2016 Hewlett Packard Enterprise Development Company, L.P.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||||
|
# not use this file except in compliance with the License. You may obtain
|
||||||
|
# a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
# License for the specific language governing permissions and limitations
|
||||||
|
# under the License.
|
||||||
|
|
||||||
|
from oslo_config import cfg
|
||||||
|
from oslo_middleware import cors
|
||||||
|
|
||||||
|
|
||||||
|
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']
|
||||||
|
)
|
|
@ -20,6 +20,7 @@ import oslo_i18n
|
||||||
from oslo_log import log
|
from oslo_log import log
|
||||||
from oslo_reports import guru_meditation_report as gmr
|
from oslo_reports import guru_meditation_report as gmr
|
||||||
|
|
||||||
|
from ceilometer.conf import defaults
|
||||||
from ceilometer import keystone_client
|
from ceilometer import keystone_client
|
||||||
from ceilometer import messaging
|
from ceilometer import messaging
|
||||||
from ceilometer import version
|
from ceilometer import version
|
||||||
|
@ -73,6 +74,7 @@ def prepare_service(argv=None, config_files=None):
|
||||||
['stevedore=INFO', 'keystoneclient=INFO',
|
['stevedore=INFO', 'keystoneclient=INFO',
|
||||||
'neutronclient=INFO'])
|
'neutronclient=INFO'])
|
||||||
log.set_defaults(default_log_levels=log_levels)
|
log.set_defaults(default_log_levels=log_levels)
|
||||||
|
defaults.set_cors_middleware_defaults()
|
||||||
|
|
||||||
if argv is None:
|
if argv is None:
|
||||||
argv = sys.argv
|
argv = sys.argv
|
||||||
|
|
|
@ -22,6 +22,3 @@ paste.filter_factory = oslo_middleware:RequestId.factory
|
||||||
[filter:cors]
|
[filter:cors]
|
||||||
paste.filter_factory = oslo_middleware.cors:filter_factory
|
paste.filter_factory = oslo_middleware.cors:filter_factory
|
||||||
oslo_config_project = ceilometer
|
oslo_config_project = ceilometer
|
||||||
latent_allow_headers = X-Auth-Token, X-Identity-Status, X-Roles, X-Service-Catalog, X-User-Id, X-Tenant-Id, X-OpenStack-Request-ID
|
|
||||||
latent_expose_headers = X-Auth-Token, X-Subject-Token, X-Service-Token, X-OpenStack-Request-ID
|
|
||||||
latent_allow_methods = GET, PUT, POST, DELETE, PATCH
|
|
||||||
|
|
|
@ -19,6 +19,3 @@ paste.filter_factory = oslo_middleware:RequestId.factory
|
||||||
[filter:cors]
|
[filter:cors]
|
||||||
paste.filter_factory = oslo_middleware.cors:filter_factory
|
paste.filter_factory = oslo_middleware.cors:filter_factory
|
||||||
oslo_config_project = ceilometer
|
oslo_config_project = ceilometer
|
||||||
latent_allow_headers = X-Auth-Token, X-Identity-Status, X-Roles, X-Service-Catalog, X-User-Id, X-Tenant-Id, X-OpenStack-Request-ID
|
|
||||||
latent_expose_headers = X-Auth-Token, X-Subject-Token, X-Service-Token, X-OpenStack-Request-ID
|
|
||||||
latent_allow_methods = GET, PUT, POST, DELETE, PATCH
|
|
|
@ -268,6 +268,9 @@ network.statistics.drivers =
|
||||||
oslo.config.opts =
|
oslo.config.opts =
|
||||||
ceilometer = ceilometer.opts:list_opts
|
ceilometer = ceilometer.opts:list_opts
|
||||||
|
|
||||||
|
oslo.config.opts.defaults =
|
||||||
|
oslo.middleware.cors = ceilometer.conf.defaults:set_cors_middleware_defaults
|
||||||
|
|
||||||
keystoneauth1.plugin =
|
keystoneauth1.plugin =
|
||||||
password-ceilometer-legacy = ceilometer.keystone_client:LegacyCeilometerKeystoneLoader
|
password-ceilometer-legacy = ceilometer.keystone_client:LegacyCeilometerKeystoneLoader
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue