diff options
author | Michael Krotscheck <krotscheck@gmail.com> | 2016-03-04 09:20:45 -0800 |
---|---|---|
committer | Michael Krotscheck <krotscheck@gmail.com> | 2016-03-14 08:19:29 -0700 |
commit | 59ccb2f7515be43ca06436d2131bfa2b737ee092 (patch) | |
tree | f37ea8be5f93e069ff28c019a19a9f0e341b4228 /heat/httpd | |
parent | e37e73e63dcc9f086fd7f6343b328e8ac9d68c1c (diff) | |
download | heat-59ccb2f7515be43ca06436d2131bfa2b737ee092.tar.gz |
Moved CORS middleware configuration into oslo-config-generator
The default values needed for heat'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 configuration parsing. This ensures
that if a value remains unset in heat.conf, it will be set
to use sane defaults, and that an operator modifying the
configuration file will be presented with a default set of
necessary sane headers.
Change-Id: Ie3791007b33788829417ce508a3c719ae626bbce
Closes-Bug: 1551836
Diffstat (limited to 'heat/httpd')
-rw-r--r-- | heat/httpd/heat_api.py | 1 | ||||
-rw-r--r-- | heat/httpd/heat_api_cfn.py | 1 | ||||
-rw-r--r-- | heat/httpd/heat_api_cloudwatch.py | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/heat/httpd/heat_api.py b/heat/httpd/heat_api.py index 828aa483b..9149dd23c 100644 --- a/heat/httpd/heat_api.py +++ b/heat/httpd/heat_api.py @@ -38,6 +38,7 @@ def init_application(): version = hversion.version_info.version_string() cfg.CONF(project='heat', prog='heat-api', version=version) logging.setup(cfg.CONF, 'heat-api') + config.set_config_defaults() messaging.setup() port = cfg.CONF.heat_api.bind_port diff --git a/heat/httpd/heat_api_cfn.py b/heat/httpd/heat_api_cfn.py index 77e2ef323..771fa85e0 100644 --- a/heat/httpd/heat_api_cfn.py +++ b/heat/httpd/heat_api_cfn.py @@ -40,6 +40,7 @@ def init_application(): version=version.version_info.version_string()) logging.setup(cfg.CONF, 'heat-api-cfn') logging.set_defaults() + config.set_config_defaults() messaging.setup() port = cfg.CONF.heat_api_cfn.bind_port diff --git a/heat/httpd/heat_api_cloudwatch.py b/heat/httpd/heat_api_cloudwatch.py index 68b2cc447..7aa2ce890 100644 --- a/heat/httpd/heat_api_cloudwatch.py +++ b/heat/httpd/heat_api_cloudwatch.py @@ -40,6 +40,7 @@ def init_application(): version=version.version_info.version_string()) logging.setup(cfg.CONF, 'heat-api-cloudwatch') logging.set_defaults() + config.set_config_defaults() messaging.setup() port = cfg.CONF.heat_api_cloudwatch.bind_port |