Remove compat cfg wrapper

This wrapper was there to allow oslo-config changes through the gate
while keystoneclient hadn't been updated.

Change-Id: I3d48673af58ae379e8e4d2c7fb4b4d81f3ed67dd

2 files changed, 2 insertions, 18 deletions

diff --git a/nova/openstack/common/cfg.py b/nova/openstack/common/cfg.py
deleted file mode 100644
index c35dcb845..000000000
--- a/nova/openstack/common/cfg.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2013 Red Hat, Inc.
-#
-#    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.cfg import *
diff --git a/nova/openstack/common/db/api.py b/nova/openstack/common/db/api.py
index edb42074f..90a200875 100644
--- a/nova/openstack/common/db/api.py
+++ b/nova/openstack/common/db/api.py
@@ -37,7 +37,8 @@ https://bitbucket.org/eventlet/eventlet/issue/137/
 """
 import functools
 
-from nova.openstack.common import cfg
+from oslo.config import cfg
+
 from nova.openstack.common import lockutils
 from nova.openstack.common import importutils