From d2bf89525899da10c4dbabd9d81aca733a25230f Mon Sep 17 00:00:00 2001 From: Michael Krotscheck Date: Wed, 2 Mar 2016 10:26:32 -0800 Subject: [PATCH] Moved CORS middleware configuration into oslo-config-generator The default values needed for sahara's implementation of cors middleware have been moved from paste.ini into the configuration hooks provided by oslo.config. Furthermore, these values have been added to the default initialization procedure. This ensures that if a value remains unset in the configuration file, it will fallback to using sane defaults. It also ensures that an operator modifying the configuration will be presented with that same set of defaults. Change-Id: Iedcaa002ff3d40cf61168769bc3946f8c6e42b87 Closes-Bug: 1551836 --- setup.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.cfg b/setup.cfg index 0c973dc..3377849 100644 --- a/setup.cfg +++ b/setup.cfg @@ -62,6 +62,9 @@ sahara.run.mode = oslo.config.opts = sahara.config = sahara.config:list_opts +oslo.config.opts.defaults = + oslo.middleware.cors = sahara.common.config:set_cors_middleware_defaults + tempest.test_plugins = sahara_clients_scenario_tests = sahara.tests.tempest.scenario.data_processing.plugin:SaharaClientsScenarioPlugin