Merge "cors: update default configuration in config"

2017-01-10 19:59:49 +00:00
parent da25ec9f7a 086b7a7de9
commit 379e41f653
1 changed files with 18 additions and 21 deletions
--- a/nova/common/config.py
+++ b/nova/common/config.py
@@ -12,15 +12,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.

-from oslo_config import cfg
 from oslo_middleware import cors


 def set_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,
+    cors.set_defaults(
        allow_headers=['X-Auth-Token',
                       'X-Openstack-Request-Id',
                       'X-Identity-Status',