openstack/ironic
Code Issues Proposed changes

Merge "Switched order of CORS middleware"

Browse Source
This commit is contained in:
Jenkins 2015-10-23 09:03:26 +00:00 committed by Gerrit Code Review
commit fc51cc9939
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ironic/api/app.py
View File

@ -76,6 +76,9 @@ def setup_app(pecan_config=None, extra_hooks=None):
wrap_app=middleware.ParsableErrorMiddleware, wrap_app=middleware.ParsableErrorMiddleware,
) )
if pecan_config.app.enable_acl:
app = acl.install(app, cfg.CONF, pecan_config.app.acl_public_routes)
# Create a CORS wrapper, and attach ironic-specific defaults that must be # Create a CORS wrapper, and attach ironic-specific defaults that must be
# included in all CORS responses. # included in all CORS responses.
app = cors_middleware.CORS(app, CONF) app = cors_middleware.CORS(app, CONF)
@ -85,9 +88,6 @@ def setup_app(pecan_config=None, extra_hooks=None):
expose_headers=[Version.max_string, Version.min_string, Version.string] expose_headers=[Version.max_string, Version.min_string, Version.string]
) )
if pecan_config.app.enable_acl:
return acl.install(app, cfg.CONF, pecan_config.app.acl_public_routes)
return app return app