Use oslo_config instead of deprecated oslo.config

Change-Id: I85d5c8d3d9f00f86fd14500be0da1289f5672614

113 files changed, 117 insertions, 117 deletions

diff --git a/ceilometer/agent/base.py b/ceilometer/agent/base.py
index 004fb23b..78ca1764 100644
--- a/ceilometer/agent/base.py
+++ b/ceilometer/agent/base.py
@@ -22,7 +22,7 @@ import collections
 import fnmatch
 import itertools
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_context import context
 import six
 from six.moves.urllib import parse as urlparse
diff --git a/ceilometer/agent/discovery/endpoint.py b/ceilometer/agent/discovery/endpoint.py
index 4d628e19..c7c84b36 100644
--- a/ceilometer/agent/discovery/endpoint.py
+++ b/ceilometer/agent/discovery/endpoint.py
@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ceilometer.agent import plugin_base as plugin
 from ceilometer.i18n import _LW
diff --git a/ceilometer/agent/discovery/tenant.py b/ceilometer/agent/discovery/tenant.py
index 8e2c7deb..8c043038 100644
--- a/ceilometer/agent/discovery/tenant.py
+++ b/ceilometer/agent/discovery/tenant.py
@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ceilometer.agent import plugin_base as plugin
 from ceilometer.openstack.common import log
diff --git a/ceilometer/agent/manager.py b/ceilometer/agent/manager.py
index 91dfcf7b..95ad9a3e 100644
--- a/ceilometer/agent/manager.py
+++ b/ceilometer/agent/manager.py
@@ -16,7 +16,7 @@
 # under the License.
 
 from keystoneclient.v2_0 import client as ksclient
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ceilometer.agent import base
 from ceilometer.openstack.common import log
diff --git a/ceilometer/agent/plugin_base.py b/ceilometer/agent/plugin_base.py
index ebc44c5d..b3b82264 100644
--- a/ceilometer/agent/plugin_base.py
+++ b/ceilometer/agent/plugin_base.py
@@ -22,8 +22,8 @@ import collections
 import fnmatch
 
 from keystoneclient.v2_0 import client as ksclient
-from oslo.config import cfg
 import oslo.messaging
+from oslo_config import cfg
 from oslo_context import context
 import six
 
diff --git a/ceilometer/alarm/evaluator/__init__.py b/ceilometer/alarm/evaluator/__init__.py
index 2de9b73f..79c2a802 100644
--- a/ceilometer/alarm/evaluator/__init__.py
+++ b/ceilometer/alarm/evaluator/__init__.py
@@ -21,7 +21,7 @@ import datetime
 
 from ceilometerclient import client as ceiloclient
 import croniter
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import timeutils
 import pytz
 import six
diff --git a/ceilometer/alarm/notifier/rest.py b/ceilometer/alarm/notifier/rest.py
index e923ead0..496f4f37 100644
--- a/ceilometer/alarm/notifier/rest.py
+++ b/ceilometer/alarm/notifier/rest.py
@@ -17,8 +17,8 @@
 """Rest alarm notifier."""
 
 import eventlet
-from oslo.config import cfg
 from oslo.serialization import jsonutils
+from oslo_config import cfg
 from oslo_context import context
 import requests
 import six.moves.urllib.parse as urlparse
diff --git a/ceilometer/alarm/notifier/trust.py b/ceilometer/alarm/notifier/trust.py
index 3a8f574f..818ffc09 100644
--- a/ceilometer/alarm/notifier/trust.py
+++ b/ceilometer/alarm/notifier/trust.py
@@ -15,7 +15,7 @@
 """Rest alarm notifier with trusted authentication."""
 
 from keystoneclient.v3 import client as keystone_client
-from oslo.config import cfg
+from oslo_config import cfg
 from six.moves.urllib import parse
 
 from ceilometer.alarm.notifier import rest
diff --git a/ceilometer/alarm/rpc.py b/ceilometer/alarm/rpc.py
index b50303c5..a583703b 100644
--- a/ceilometer/alarm/rpc.py
+++ b/ceilometer/alarm/rpc.py
@@ -15,7 +15,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_context import context
 import six
 
diff --git a/ceilometer/alarm/service.py b/ceilometer/alarm/service.py
index c9f93a2a..6cbb2aea 100644
--- a/ceilometer/alarm/service.py
+++ b/ceilometer/alarm/service.py
@@ -20,7 +20,7 @@
 import abc
 
 from ceilometerclient import client as ceiloclient
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import netutils
 import six
 from stevedore import extension
diff --git a/ceilometer/alarm/storage/impl_sqlalchemy.py b/ceilometer/alarm/storage/impl_sqlalchemy.py
index 18dc4d12..b71bf11d 100644
--- a/ceilometer/alarm/storage/impl_sqlalchemy.py
+++ b/ceilometer/alarm/storage/impl_sqlalchemy.py
@@ -19,8 +19,8 @@
 from __future__ import absolute_import
 import os
 
-from oslo.config import cfg
 from oslo.db.sqlalchemy import session as db_session
+from oslo_config import cfg
 from sqlalchemy import desc
 
 import ceilometer
diff --git a/ceilometer/api/__init__.py b/ceilometer/api/__init__.py
index 6585d716..474de123 100644
--- a/ceilometer/api/__init__.py
+++ b/ceilometer/api/__init__.py
@@ -15,7 +15,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 # Register options for the service
 OPTS = [
diff --git a/ceilometer/api/app.py b/ceilometer/api/app.py
index e5f0174c..4037d3a3 100644
--- a/ceilometer/api/app.py
+++ b/ceilometer/api/app.py
@@ -21,7 +21,7 @@ import socket
 from wsgiref import simple_server
 
 import netaddr
-from oslo.config import cfg
+from oslo_config import cfg
 from paste import deploy
 import pecan
 
diff --git a/ceilometer/api/controllers/v2.py b/ceilometer/api/controllers/v2.py
index 66dbd9f5..f0d1ac4d 100644
--- a/ceilometer/api/controllers/v2.py
+++ b/ceilometer/api/controllers/v2.py
@@ -37,7 +37,7 @@ import uuid
 
 import croniter
 import jsonschema
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_context import context
 from oslo_utils import netutils
 from oslo_utils import strutils
diff --git a/ceilometer/api/hooks.py b/ceilometer/api/hooks.py
index dae4a3dc..43efbd2a 100644
--- a/ceilometer/api/hooks.py
+++ b/ceilometer/api/hooks.py
@@ -18,7 +18,7 @@
 
 import threading
 
-from oslo.config import cfg
+from oslo_config import cfg
 from pecan import hooks
 
 from ceilometer import pipeline
diff --git a/ceilometer/cli.py b/ceilometer/cli.py
index b14ab699..f67b8153 100644
--- a/ceilometer/cli.py
+++ b/ceilometer/cli.py
@@ -28,7 +28,7 @@ import eventlet
 # first read() or select(), thread need to be patched too, because
 # oslo.messaging use threading.local
 eventlet.monkey_patch(socket=True, select=True, thread=True)
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_context import context
 from oslo_utils import timeutils
 
diff --git a/ceilometer/cmd/alarm.py b/ceilometer/cmd/alarm.py
index 0c0c9497..5e84f0ae 100644
--- a/ceilometer/cmd/alarm.py
+++ b/ceilometer/cmd/alarm.py
@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from stevedore import driver
 
 from ceilometer.alarm import service as alarm_service
diff --git a/ceilometer/cmd/polling.py b/ceilometer/cmd/polling.py
index 05dde993..afa65fce 100644
--- a/ceilometer/cmd/polling.py
+++ b/ceilometer/cmd/polling.py
@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ceilometer.agent import manager
 from ceilometer.openstack.common import service as os_service
diff --git a/ceilometer/cmd/storage.py b/ceilometer/cmd/storage.py
index ac684d68..380f3e53 100644
--- a/ceilometer/cmd/storage.py
+++ b/ceilometer/cmd/storage.py
@@ -16,7 +16,7 @@
 
 import logging
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ceilometer.i18n import _
 from ceilometer import service
diff --git a/ceilometer/collector.py b/ceilometer/collector.py
index 15bcaeac..57c7c169 100644
--- a/ceilometer/collector.py
+++ b/ceilometer/collector.py
@@ -18,8 +18,8 @@
 import socket
 
 import msgpack
-from oslo.config import cfg
 import oslo.messaging
+from oslo_config import cfg
 from oslo_utils import units
 
 from ceilometer import dispatcher
diff --git a/ceilometer/compute/discovery.py b/ceilometer/compute/discovery.py
index 05175f21..ddf7b4a2 100644
--- a/ceilometer/compute/discovery.py
+++ b/ceilometer/compute/discovery.py
@@ -15,7 +15,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ceilometer.agent import plugin_base
 from ceilometer import nova_client
diff --git a/ceilometer/compute/notifications/__init__.py b/ceilometer/compute/notifications/__init__.py
index a5213043..890a9121 100644
--- a/ceilometer/compute/notifications/__init__.py
+++ b/ceilometer/compute/notifications/__init__.py
@@ -15,8 +15,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
 import oslo.messaging
+from oslo_config import cfg
 
 from ceilometer.agent import plugin_base
 
diff --git a/ceilometer/compute/util.py b/ceilometer/compute/util.py
index 56b3b1f5..26f77111 100644
--- a/ceilometer/compute/util.py
+++ b/ceilometer/compute/util.py
@@ -15,7 +15,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 
diff --git a/ceilometer/compute/virt/hyperv/inspector.py b/ceilometer/compute/virt/hyperv/inspector.py
index 115082fc..8deda07a 100644
--- a/ceilometer/compute/virt/hyperv/inspector.py
+++ b/ceilometer/compute/virt/hyperv/inspector.py
@@ -16,7 +16,7 @@
 # under the License.
 """Implementation of Inspector abstraction for Hyper-V"""
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import units
 
 from ceilometer.compute.pollsters import util
diff --git a/ceilometer/compute/virt/hyperv/utilsv2.py b/ceilometer/compute/virt/hyperv/utilsv2.py
index faf82877..a0062002 100644
--- a/ceilometer/compute/virt/hyperv/utilsv2.py
+++ b/ceilometer/compute/virt/hyperv/utilsv2.py
@@ -25,7 +25,7 @@ import sys
 if sys.platform == 'win32':
     import wmi
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ceilometer.compute.virt import inspector
 from ceilometer.i18n import _
diff --git a/ceilometer/compute/virt/inspector.py b/ceilometer/compute/virt/inspector.py
index 299d9635..bc09f96a 100644
--- a/ceilometer/compute/virt/inspector.py
+++ b/ceilometer/compute/virt/inspector.py
@@ -19,7 +19,7 @@
 
 import collections
 
-from oslo.config import cfg
+from oslo_config import cfg
 from stevedore import driver
 
 import ceilometer
diff --git a/ceilometer/compute/virt/libvirt/inspector.py b/ceilometer/compute/virt/libvirt/inspector.py
index 7b0ef022..75beabf4 100644
--- a/ceilometer/compute/virt/libvirt/inspector.py
+++ b/ceilometer/compute/virt/libvirt/inspector.py
@@ -17,7 +17,7 @@
 """Implementation of Inspector abstraction for libvirt."""
 
 from lxml import etree
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import units
 import six
 
diff --git a/ceilometer/compute/virt/vmware/inspector.py b/ceilometer/compute/virt/vmware/inspector.py
index 0d73dc4f..0c734441 100644
--- a/ceilometer/compute/virt/vmware/inspector.py
+++ b/ceilometer/compute/virt/vmware/inspector.py
@@ -15,8 +15,8 @@
 
 """Implementation of Inspector abstraction for VMware vSphere"""
 
-from oslo.config import cfg
 from oslo.vmware import api
+from oslo_config import cfg
 from oslo_utils import units
 
 from ceilometer.compute.virt import inspector as virt_inspector
diff --git a/ceilometer/compute/virt/xenapi/inspector.py b/ceilometer/compute/virt/xenapi/inspector.py
index 07cb0e49..c3b29349 100644
--- a/ceilometer/compute/virt/xenapi/inspector.py
+++ b/ceilometer/compute/virt/xenapi/inspector.py
@@ -16,7 +16,7 @@
 """Implementation of Inspector abstraction for XenAPI."""
 
 from eventlet import timeout
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import units
 try:
     import XenAPI as api
diff --git a/ceilometer/coordination.py b/ceilometer/coordination.py
index f189fd62..161112b2 100644
--- a/ceilometer/coordination.py
+++ b/ceilometer/coordination.py
@@ -17,7 +17,7 @@
 
 import uuid
 
-from oslo.config import cfg
+from oslo_config import cfg
 import tooz.coordination
 
 from ceilometer.i18n import _LE, _LI
diff --git a/ceilometer/data_processing/notifications.py b/ceilometer/data_processing/notifications.py
index 8ec61097..eb2b9e75 100644
--- a/ceilometer/data_processing/notifications.py
+++ b/ceilometer/data_processing/notifications.py
@@ -13,9 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-from oslo.config import cfg
 import oslo.messaging
+from oslo_config import cfg
 
 from ceilometer.agent import plugin_base
 from ceilometer import sample
diff --git a/ceilometer/dispatcher/__init__.py b/ceilometer/dispatcher/__init__.py
index 86d2b013..d7a49c82 100644
--- a/ceilometer/dispatcher/__init__.py
+++ b/ceilometer/dispatcher/__init__.py
@@ -17,7 +17,7 @@
 
 import abc
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 from stevedore import named
 
diff --git a/ceilometer/dispatcher/file.py b/ceilometer/dispatcher/file.py
index 72e498a2..a6dfdddf 100644
--- a/ceilometer/dispatcher/file.py
+++ b/ceilometer/dispatcher/file.py
@@ -18,7 +18,7 @@
 import logging
 import logging.handlers
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ceilometer import dispatcher
 
diff --git a/ceilometer/dispatcher/http.py b/ceilometer/dispatcher/http.py
index ba8627c0..d9add5a8 100755
--- a/ceilometer/dispatcher/http.py
+++ b/ceilometer/dispatcher/http.py
@@ -16,7 +16,7 @@
 
 import json
 
-from oslo.config import cfg
+from oslo_config import cfg
 import requests
 
 from ceilometer import dispatcher
diff --git a/ceilometer/energy/kwapi.py b/ceilometer/energy/kwapi.py
index 93e490e0..0e6bc212 100644
--- a/ceilometer/energy/kwapi.py
+++ b/ceilometer/energy/kwapi.py
@@ -17,7 +17,7 @@
 import datetime
 
 from keystoneclient import exceptions
-from oslo.config import cfg
+from oslo_config import cfg
 import requests
 import six
 
diff --git a/ceilometer/event/converter.py b/ceilometer/event/converter.py
index fe646671..b65b8851 100644
--- a/ceilometer/event/converter.py
+++ b/ceilometer/event/converter.py
@@ -19,7 +19,7 @@ import fnmatch
 import os
 
 import jsonpath_rw
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import timeutils
 import six
 import yaml
diff --git a/ceilometer/event/endpoint.py b/ceilometer/event/endpoint.py
index cdd9a42a..30ab4ba6 100644
--- a/ceilometer/event/endpoint.py
+++ b/ceilometer/event/endpoint.py
@@ -17,8 +17,8 @@
 
 import logging
 
-from oslo.config import cfg
 import oslo.messaging
+from oslo_config import cfg
 from stevedore import extension
 
 import ceilometer
diff --git a/ceilometer/event/storage/impl_sqlalchemy.py b/ceilometer/event/storage/impl_sqlalchemy.py
index a4227266..89038b3f 100644
--- a/ceilometer/event/storage/impl_sqlalchemy.py
+++ b/ceilometer/event/storage/impl_sqlalchemy.py
@@ -17,9 +17,9 @@ from __future__ import absolute_import
 import operator
 import os
 
-from oslo.config import cfg
 from oslo.db import exception as dbexc
 from oslo.db.sqlalchemy import session as db_session
+from oslo_config import cfg
 import six
 import sqlalchemy as sa
 
diff --git a/ceilometer/hardware/discovery.py b/ceilometer/hardware/discovery.py
index fa254472..f959652b 100644
--- a/ceilometer/hardware/discovery.py
+++ b/ceilometer/hardware/discovery.py
@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ceilometer.agent import plugin_base
 from ceilometer.i18n import _
diff --git a/ceilometer/identity/notifications.py b/ceilometer/identity/notifications.py
index 1c6dad68..9b75074c 100644
--- a/ceilometer/identity/notifications.py
+++ b/ceilometer/identity/notifications.py
@@ -11,8 +11,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
 import oslo.messaging
+from oslo_config import cfg
 
 from ceilometer.agent import plugin_base
 from ceilometer import sample
diff --git a/ceilometer/image/glance.py b/ceilometer/image/glance.py
index 8f4964ae..1df85d90 100644
--- a/ceilometer/image/glance.py
+++ b/ceilometer/image/glance.py
@@ -21,7 +21,7 @@ from __future__ import absolute_import
 import itertools
 
 import glanceclient
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import timeutils
 
 from ceilometer.agent import plugin_base
diff --git a/ceilometer/image/notifications.py b/ceilometer/image/notifications.py
index dce3ed20..a96a744d 100644
--- a/ceilometer/image/notifications.py
+++ b/ceilometer/image/notifications.py
@@ -18,8 +18,8 @@
    events.
 """
 
-from oslo.config import cfg
 import oslo.messaging
+from oslo_config import cfg
 
 from ceilometer.agent import plugin_base
 from ceilometer import sample
diff --git a/ceilometer/ipmi/notifications/ironic.py b/ceilometer/ipmi/notifications/ironic.py
index ed40279a..0e359000 100644
--- a/ceilometer/ipmi/notifications/ironic.py
+++ b/ceilometer/ipmi/notifications/ironic.py
@@ -18,8 +18,8 @@
 notification events.
 """
 
-from oslo.config import cfg
 from oslo import messaging
+from oslo_config import cfg
 
 from ceilometer.agent import plugin_base
 from ceilometer.openstack.common import log
diff --git a/ceilometer/ipmi/platform/intel_node_manager.py b/ceilometer/ipmi/platform/intel_node_manager.py
index 85b81d51..cbf7c5c8 100644
--- a/ceilometer/ipmi/platform/intel_node_manager.py
+++ b/ceilometer/ipmi/platform/intel_node_manager.py
@@ -29,7 +29,7 @@ import collections
 import tempfile
 import time
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ceilometer.i18n import _
 from ceilometer.ipmi.platform import exception as nmexcept
diff --git a/ceilometer/ipmi/pollsters/node.py b/ceilometer/ipmi/pollsters/node.py
index b6fc1aff..46aabcf3 100644
--- a/ceilometer/ipmi/pollsters/node.py
+++ b/ceilometer/ipmi/pollsters/node.py
@@ -16,7 +16,7 @@
 
 import abc
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import timeutils
 import six
 
diff --git a/ceilometer/ipmi/pollsters/sensor.py b/ceilometer/ipmi/pollsters/sensor.py
index 7dda3c77..fd4d99c3 100644
--- a/ceilometer/ipmi/pollsters/sensor.py
+++ b/ceilometer/ipmi/pollsters/sensor.py
@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import timeutils
 
 from ceilometer.agent import plugin_base
diff --git a/ceilometer/key_value_storage/notifications.py b/ceilometer/key_value_storage/notifications.py
index 4eb05e85..84584d9e 100644
--- a/ceilometer/key_value_storage/notifications.py
+++ b/ceilometer/key_value_storage/notifications.py
@@ -10,8 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
 import oslo.messaging
+from oslo_config import cfg
 
 from ceilometer.agent import plugin_base
 from ceilometer import sample
diff --git a/ceilometer/messaging.py b/ceilometer/messaging.py
index 694ec77f..2c7fb302 100644
--- a/ceilometer/messaging.py
+++ b/ceilometer/messaging.py
@@ -15,9 +15,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
 import oslo.messaging
 from oslo.serialization import jsonutils
+from oslo_config import cfg
 from oslo_context import context
 
 DEFAULT_URL = "__default__"
diff --git a/ceilometer/middleware.py b/ceilometer/middleware.py
index 21e2edaa..39243ae7 100644
--- a/ceilometer/middleware.py
+++ b/ceilometer/middleware.py
@@ -15,8 +15,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
 import oslo.messaging
+from oslo_config import cfg
 
 from ceilometer.agent import plugin_base
 from ceilometer import sample
diff --git a/ceilometer/network/floatingip.py b/ceilometer/network/floatingip.py
index 59832ebf..deebb8d4 100644
--- a/ceilometer/network/floatingip.py
+++ b/ceilometer/network/floatingip.py
@@ -18,7 +18,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import timeutils
 
 from ceilometer.agent import plugin_base
diff --git a/ceilometer/network/notifications.py b/ceilometer/network/notifications.py
index 5c22c8e4..e2a67e17 100644
--- a/ceilometer/network/notifications.py
+++ b/ceilometer/network/notifications.py
@@ -19,8 +19,8 @@
 
 """
 
-from oslo.config import cfg
 import oslo.messaging
+from oslo_config import cfg
 
 from ceilometer.agent import plugin_base
 from ceilometer.i18n import _
diff --git a/ceilometer/network/services/discovery.py b/ceilometer/network/services/discovery.py
index 68dc0e0c..e96191fe 100644
--- a/ceilometer/network/services/discovery.py
+++ b/ceilometer/network/services/discovery.py
@@ -15,7 +15,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ceilometer.agent import plugin_base
 from ceilometer import neutron_client
diff --git a/ceilometer/network/statistics/opencontrail/client.py b/ceilometer/network/statistics/opencontrail/client.py
index 9d9f7c45..54c1123a 100644
--- a/ceilometer/network/statistics/opencontrail/client.py
+++ b/ceilometer/network/statistics/opencontrail/client.py
@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 import requests
 import six
 from six.moves.urllib import parse as urlparse
diff --git a/ceilometer/network/statistics/opendaylight/client.py b/ceilometer/network/statistics/opendaylight/client.py
index d5c9beb8..49989758 100644
--- a/ceilometer/network/statistics/opendaylight/client.py
+++ b/ceilometer/network/statistics/opendaylight/client.py
@@ -15,7 +15,7 @@
 
 import abc
 
-from oslo.config import cfg
+from oslo_config import cfg
 import requests
 from requests import auth
 import six
diff --git a/ceilometer/neutron_client.py b/ceilometer/neutron_client.py
index 0d46b9aa..5c43596e 100644
--- a/ceilometer/neutron_client.py
+++ b/ceilometer/neutron_client.py
@@ -18,7 +18,7 @@ import functools
 
 from neutronclient.common import exceptions
 from neutronclient.v2_0 import client as clientv20
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ceilometer.openstack.common import log
 
diff --git a/ceilometer/notification.py b/ceilometer/notification.py
index 9d0ceaa3..659d6a56 100644
--- a/ceilometer/notification.py
+++ b/ceilometer/notification.py
@@ -15,8 +15,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
 import oslo.messaging
+from oslo_config import cfg
 from oslo_context import context
 from stevedore import extension
 
diff --git a/ceilometer/nova_client.py b/ceilometer/nova_client.py
index 378143db..fca1870a 100644
--- a/ceilometer/nova_client.py
+++ b/ceilometer/nova_client.py
@@ -17,7 +17,7 @@ import functools
 
 import novaclient
 from novaclient.v1_1 import client as nova_client
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ceilometer.openstack.common import log
 
diff --git a/ceilometer/objectstore/swift.py b/ceilometer/objectstore/swift.py
index 7c82ab0d..b9ef9ed2 100644
--- a/ceilometer/objectstore/swift.py
+++ b/ceilometer/objectstore/swift.py
@@ -20,7 +20,7 @@
 from __future__ import absolute_import
 
 from keystoneclient import exceptions
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import timeutils
 import six.moves.urllib.parse as urlparse
 from swiftclient import client as swift
diff --git a/ceilometer/orchestration/notifications.py b/ceilometer/orchestration/notifications.py
index 4bd78052..236dbda7 100644
--- a/ceilometer/orchestration/notifications.py
+++ b/ceilometer/orchestration/notifications.py
@@ -15,8 +15,8 @@
    events.
 """
 
-from oslo.config import cfg
 import oslo.messaging
+from oslo_config import cfg
 
 from ceilometer.agent import plugin_base
 from ceilometer import sample
diff --git a/ceilometer/pipeline.py b/ceilometer/pipeline.py
index e169b367..8fc5820e 100644
--- a/ceilometer/pipeline.py
+++ b/ceilometer/pipeline.py
@@ -20,7 +20,7 @@
 import fnmatch
 import os
 
-from oslo.config import cfg
+from oslo_config import cfg
 import yaml
 
 from ceilometer.i18n import _
diff --git a/ceilometer/profiler/notifications.py b/ceilometer/profiler/notifications.py
index 4a7a4402..c44c376e 100644
--- a/ceilometer/profiler/notifications.py
+++ b/ceilometer/profiler/notifications.py
@@ -13,8 +13,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
 import oslo.messaging
+from oslo_config import cfg
 
 from ceilometer.agent import plugin_base
 from ceilometer import sample
diff --git a/ceilometer/publisher/messaging.py b/ceilometer/publisher/messaging.py
index 9f783557..6cfb46da 100644
--- a/ceilometer/publisher/messaging.py
+++ b/ceilometer/publisher/messaging.py
@@ -21,8 +21,8 @@ import abc
 import itertools
 import operator
 
-from oslo.config import cfg
 import oslo.messaging
+from oslo_config import cfg
 import six
 import six.moves.urllib.parse as urlparse
 
diff --git a/ceilometer/publisher/udp.py b/ceilometer/publisher/udp.py
index 5d7fde7d..9c3e2f93 100644
--- a/ceilometer/publisher/udp.py
+++ b/ceilometer/publisher/udp.py
@@ -21,7 +21,7 @@
 import socket
 
 import msgpack
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import netutils
 
 from ceilometer.i18n import _
diff --git a/ceilometer/publisher/utils.py b/ceilometer/publisher/utils.py
index 5c16636e..6169d7e5 100644
--- a/ceilometer/publisher/utils.py
+++ b/ceilometer/publisher/utils.py
@@ -21,7 +21,7 @@
 import hashlib
 import hmac
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from ceilometer import utils
diff --git a/ceilometer/sample.py b/ceilometer/sample.py
index afc2b30f..ec10ea61 100644
--- a/ceilometer/sample.py
+++ b/ceilometer/sample.py
@@ -26,7 +26,7 @@ in by the plugins that create them.
 import copy
 import uuid
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 
 OPTS = [
diff --git a/ceilometer/service.py b/ceilometer/service.py
index 21e25e32..5c4bf719 100644
--- a/ceilometer/service.py
+++ b/ceilometer/service.py
@@ -20,8 +20,8 @@ import os
 import socket
 import sys
 
-from oslo.config import cfg
 from oslo import i18n
+from oslo_config import cfg
 
 from ceilometer.i18n import _
 from ceilometer import messaging
diff --git a/ceilometer/storage/__init__.py b/ceilometer/storage/__init__.py
index 41a4002a..ff40e061 100644
--- a/ceilometer/storage/__init__.py
+++ b/ceilometer/storage/__init__.py
@@ -17,8 +17,8 @@
 """Storage backend management
 """
 
-from oslo.config import cfg
 from oslo.db import options as db_options
+from oslo_config import cfg
 import retrying
 import six
 import six.moves.urllib.parse as urlparse
diff --git a/ceilometer/storage/impl_db2.py b/ceilometer/storage/impl_db2.py
index c3e0579d..9164cd18 100644
--- a/ceilometer/storage/impl_db2.py
+++ b/ceilometer/storage/impl_db2.py
@@ -28,7 +28,7 @@ import sys
 
 import bson.code
 import bson.objectid
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import timeutils
 import pymongo
 import six
diff --git a/ceilometer/storage/impl_mongodb.py b/ceilometer/storage/impl_mongodb.py
index a3d4a0bd..db3dd581 100644
--- a/ceilometer/storage/impl_mongodb.py
+++ b/ceilometer/storage/impl_mongodb.py
@@ -29,7 +29,7 @@ import uuid
 
 import bson.code
 import bson.objectid
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import timeutils
 import pymongo
 import six
diff --git a/ceilometer/storage/impl_sqlalchemy.py b/ceilometer/storage/impl_sqlalchemy.py
index 7d4cc2c0..9f7be201 100644
--- a/ceilometer/storage/impl_sqlalchemy.py
+++ b/ceilometer/storage/impl_sqlalchemy.py
@@ -21,10 +21,10 @@ import datetime
 import hashlib
 import os
 
-from oslo.config import cfg
 from oslo.db import exception as dbexc
 from oslo.db.sqlalchemy import session as db_session
 from oslo.serialization import jsonutils
+from oslo_config import cfg
 from oslo_utils import timeutils
 import six
 import sqlalchemy as sa
diff --git a/ceilometer/storage/mongo/utils.py b/ceilometer/storage/mongo/utils.py
index 403fd029..874153da 100644
--- a/ceilometer/storage/mongo/utils.py
+++ b/ceilometer/storage/mongo/utils.py
@@ -21,7 +21,7 @@
 import time
 import weakref
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import netutils
 import pymongo
 import six
diff --git a/ceilometer/tests/agent/agentbase.py b/ceilometer/tests/agent/agentbase.py
index 72dfd0dc..00ea4481 100644
--- a/ceilometer/tests/agent/agentbase.py
+++ b/ceilometer/tests/agent/agentbase.py
@@ -26,7 +26,7 @@ import copy
 import datetime
 
 import mock
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from oslotest import mockpatch
 import six
 from stevedore import extension
diff --git a/ceilometer/tests/agent/test_discovery.py b/ceilometer/tests/agent/test_discovery.py
index e28caadd..22eaf6fd 100644
--- a/ceilometer/tests/agent/test_discovery.py
+++ b/ceilometer/tests/agent/test_discovery.py
@@ -18,7 +18,7 @@
 """
 
 import mock
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from oslotest import base
 
 from ceilometer.agent.discovery import endpoint
diff --git a/ceilometer/tests/agent/test_plugin.py b/ceilometer/tests/agent/test_plugin.py
index 3cb303f1..0c6ca46f 100644
--- a/ceilometer/tests/agent/test_plugin.py
+++ b/ceilometer/tests/agent/test_plugin.py
@@ -16,7 +16,7 @@
 # under the License.
 
 import mock
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from oslotest import base
 
 from ceilometer.agent import plugin_base
diff --git a/ceilometer/tests/alarm/evaluator/test_threshold.py b/ceilometer/tests/alarm/evaluator/test_threshold.py
index 1b03bf32..cbc41367 100644
--- a/ceilometer/tests/alarm/evaluator/test_threshold.py
+++ b/ceilometer/tests/alarm/evaluator/test_threshold.py
@@ -22,7 +22,7 @@ import uuid
 from ceilometerclient import exc
 from ceilometerclient.v2 import statistics
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import timeutils
 import pytz
 from six import moves
diff --git a/ceilometer/tests/alarm/partition/test_coordination.py b/ceilometer/tests/alarm/partition/test_coordination.py
index de434869..9c2a03d2 100644
--- a/ceilometer/tests/alarm/partition/test_coordination.py
+++ b/ceilometer/tests/alarm/partition/test_coordination.py
@@ -21,7 +21,7 @@ import logging
 import uuid
 
 import mock
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from oslo_utils import timeutils
 from six import moves
 
diff --git a/ceilometer/tests/alarm/test_alarm_svc.py b/ceilometer/tests/alarm/test_alarm_svc.py
index f2d80750..3e896dcb 100644
--- a/ceilometer/tests/alarm/test_alarm_svc.py
+++ b/ceilometer/tests/alarm/test_alarm_svc.py
@@ -17,7 +17,7 @@
 """Tests for ceilometer.alarm.service.SingletonAlarmService.
 """
 import mock
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from stevedore import extension
 
 from ceilometer.alarm import service
diff --git a/ceilometer/tests/alarm/test_notifier.py b/ceilometer/tests/alarm/test_notifier.py
index b2a2b41d..ec568913 100644
--- a/ceilometer/tests/alarm/test_notifier.py
+++ b/ceilometer/tests/alarm/test_notifier.py
@@ -16,8 +16,8 @@
 # under the License.
 
 import mock
-from oslo.config import fixture as fixture_config
 from oslo.serialization import jsonutils
+from oslo_config import fixture as fixture_config
 from oslo_context import context
 from oslotest import mockpatch
 import requests
diff --git a/ceilometer/tests/alarm/test_partitioned_alarm_svc.py b/ceilometer/tests/alarm/test_partitioned_alarm_svc.py
index 45f2eb1d..a885fb2c 100644
--- a/ceilometer/tests/alarm/test_partitioned_alarm_svc.py
+++ b/ceilometer/tests/alarm/test_partitioned_alarm_svc.py
@@ -19,7 +19,7 @@
 import contextlib
 
 import mock
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from stevedore import extension
 
 from ceilometer.alarm import service
diff --git a/ceilometer/tests/alarm/test_rpc.py b/ceilometer/tests/alarm/test_rpc.py
index 4c0dae7a..bca284f0 100644
--- a/ceilometer/tests/alarm/test_rpc.py
+++ b/ceilometer/tests/alarm/test_rpc.py
@@ -19,7 +19,7 @@ import uuid
 
 from ceilometerclient.v2 import alarms
 import eventlet
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from oslo_utils import timeutils
 import six
 
diff --git a/ceilometer/tests/alarm/test_singleton_alarm_svc.py b/ceilometer/tests/alarm/test_singleton_alarm_svc.py
index f6bd2aff..3d004092 100644
--- a/ceilometer/tests/alarm/test_singleton_alarm_svc.py
+++ b/ceilometer/tests/alarm/test_singleton_alarm_svc.py
@@ -17,7 +17,7 @@
 """Tests for ceilometer.alarm.service.SingletonAlarmService.
 """
 import mock
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from stevedore import extension
 
 from ceilometer.alarm import service
diff --git a/ceilometer/tests/api/__init__.py b/ceilometer/tests/api/__init__.py
index 9152f853..f687e3c6 100644
--- a/ceilometer/tests/api/__init__.py
+++ b/ceilometer/tests/api/__init__.py
@@ -17,8 +17,8 @@
 """Base classes for API tests.
 """
 
-from oslo.config import cfg
-from oslo.config import fixture as fixture_config
+from oslo_config import cfg
+from oslo_config import fixture as fixture_config
 import pecan
 import pecan.testing
 
diff --git a/ceilometer/tests/api/test_app.py b/ceilometer/tests/api/test_app.py
index 5fb48331..5daa60d8 100644
--- a/ceilometer/tests/api/test_app.py
+++ b/ceilometer/tests/api/test_app.py
@@ -18,8 +18,8 @@
 import socket
 
 import mock
-from oslo.config import cfg
-from oslo.config import fixture as fixture_config
+from oslo_config import cfg
+from oslo_config import fixture as fixture_config
 
 from ceilometer.api import app
 from ceilometer.tests import base
diff --git a/ceilometer/tests/data_processing/test_notifications.py b/ceilometer/tests/data_processing/test_notifications.py
index 9ee25eb4..557d673e 100644
--- a/ceilometer/tests/data_processing/test_notifications.py
+++ b/ceilometer/tests/data_processing/test_notifications.py
@@ -16,7 +16,7 @@
 import datetime
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from oslotest import base
 
 from ceilometer.data_processing import notifications
diff --git a/ceilometer/tests/db.py b/ceilometer/tests/db.py
index f29d4fee..79d08371 100644
--- a/ceilometer/tests/db.py
+++ b/ceilometer/tests/db.py
@@ -24,7 +24,7 @@ import warnings
 
 import fixtures
 import mock
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from oslotest import mockpatch
 import six
 from six.moves.urllib import parse as urlparse
diff --git a/ceilometer/tests/dispatcher/test_db.py b/ceilometer/tests/dispatcher/test_db.py
index 26eecb85..c144af72 100644
--- a/ceilometer/tests/dispatcher/test_db.py
+++ b/ceilometer/tests/dispatcher/test_db.py
@@ -18,7 +18,7 @@ import datetime
 import uuid
 
 import mock
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from oslotest import base
 
 from ceilometer.dispatcher import database
diff --git a/ceilometer/tests/dispatcher/test_file.py b/ceilometer/tests/dispatcher/test_file.py
index bdb6f181..0d8360d4 100644
--- a/ceilometer/tests/dispatcher/test_file.py
+++ b/ceilometer/tests/dispatcher/test_file.py
@@ -18,7 +18,7 @@ import logging.handlers
 import os
 import tempfile
 
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from oslotest import base
 
 from ceilometer.dispatcher import file
diff --git a/ceilometer/tests/dispatcher/test_http.py b/ceilometer/tests/dispatcher/test_http.py
index 5f69af84..6f394237 100755
--- a/ceilometer/tests/dispatcher/test_http.py
+++ b/ceilometer/tests/dispatcher/test_http.py
@@ -16,7 +16,7 @@
 # under the License.
 
 import mock
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from oslotest import base
 import requests
 
diff --git a/ceilometer/tests/event/test_converter.py b/ceilometer/tests/event/test_converter.py
index 53f84a30..b768a64e 100644
--- a/ceilometer/tests/event/test_converter.py
+++ b/ceilometer/tests/event/test_converter.py
@@ -19,7 +19,7 @@ import datetime
 
 import jsonpath_rw
 import mock
-from oslo.config import cfg as oslo_cfg
+from oslo_config import cfg as oslo_cfg
 import six
 
 from ceilometer.event import converter
diff --git a/ceilometer/tests/event/test_endpoint.py b/ceilometer/tests/event/test_endpoint.py
index c87611c5..be540990 100644
--- a/ceilometer/tests/event/test_endpoint.py
+++ b/ceilometer/tests/event/test_endpoint.py
@@ -17,9 +17,9 @@
 """Tests for Ceilometer notify daemon."""
 
 import mock
-from oslo.config import cfg
-from oslo.config import fixture as fixture_config
 import oslo.messaging
+from oslo_config import cfg
+from oslo_config import fixture as fixture_config
 from stevedore import extension
 
 import ceilometer
diff --git a/ceilometer/tests/image/test_glance.py b/ceilometer/tests/image/test_glance.py
index e245e987..92d71eeb 100644
--- a/ceilometer/tests/image/test_glance.py
+++ b/ceilometer/tests/image/test_glance.py
@@ -16,7 +16,7 @@
 # under the License.
 
 import mock
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from oslo_context import context
 from oslotest import base
 from oslotest import mockpatch
diff --git a/ceilometer/tests/ipmi/pollsters/test_node.py b/ceilometer/tests/ipmi/pollsters/test_node.py
index 16f546e7..30fc45dd 100644
--- a/ceilometer/tests/ipmi/pollsters/test_node.py
+++ b/ceilometer/tests/ipmi/pollsters/test_node.py
@@ -15,7 +15,7 @@
 # under the License.
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ceilometer.ipmi.pollsters import node
 from ceilometer.tests.ipmi.pollsters import base
diff --git a/ceilometer/tests/ipmi/pollsters/test_sensor.py b/ceilometer/tests/ipmi/pollsters/test_sensor.py
index 3b4ab31c..336a7f90 100644
--- a/ceilometer/tests/ipmi/pollsters/test_sensor.py
+++ b/ceilometer/tests/ipmi/pollsters/test_sensor.py
@@ -15,7 +15,7 @@
 # under the License.
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ceilometer.ipmi.pollsters import sensor
 from ceilometer.tests.ipmi.notifications import ipmi_test_data
diff --git a/ceilometer/tests/objectstore/test_swift_middleware.py b/ceilometer/tests/objectstore/test_swift_middleware.py
index 426f10c0..c7cb14f7 100644
--- a/ceilometer/tests/objectstore/test_swift_middleware.py
+++ b/ceilometer/tests/objectstore/test_swift_middleware.py
@@ -17,7 +17,7 @@
 # under the License.
 
 import mock
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from oslotest import mockpatch
 import six
 
diff --git a/ceilometer/tests/orchestration/test_notifications.py b/ceilometer/tests/orchestration/test_notifications.py
index e98643f2..7addb7a6 100644
--- a/ceilometer/tests/orchestration/test_notifications.py
+++ b/ceilometer/tests/orchestration/test_notifications.py
@@ -15,7 +15,7 @@
 import datetime
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from oslotest import base
 
 from ceilometer.openstack.common import log
diff --git a/ceilometer/tests/publisher/test_messaging_publisher.py b/ceilometer/tests/publisher/test_messaging_publisher.py
index 5998d29c..94f9bbaa 100644
--- a/ceilometer/tests/publisher/test_messaging_publisher.py
+++ b/ceilometer/tests/publisher/test_messaging_publisher.py
@@ -21,8 +21,8 @@ import datetime
 
 import eventlet
 import mock
-from oslo.config import fixture as fixture_config
 import oslo.messaging
+from oslo_config import fixture as fixture_config
 from oslo_context import context
 from oslo_utils import netutils
 import testscenarios.testcase
diff --git a/ceilometer/tests/publisher/test_udp.py b/ceilometer/tests/publisher/test_udp.py
index 8f618875..80a64044 100644
--- a/ceilometer/tests/publisher/test_udp.py
+++ b/ceilometer/tests/publisher/test_udp.py
@@ -21,7 +21,7 @@ import datetime
 
 import mock
 import msgpack
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from oslo_utils import netutils
 from oslotest import base
 
diff --git a/ceilometer/tests/storage/test_get_connection.py b/ceilometer/tests/storage/test_get_connection.py
index f057ee74..6148c2d9 100644
--- a/ceilometer/tests/storage/test_get_connection.py
+++ b/ceilometer/tests/storage/test_get_connection.py
@@ -17,7 +17,7 @@
 """Tests for ceilometer/storage/
 """
 import mock
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from oslotest import base
 import retrying
 
diff --git a/ceilometer/tests/storage/test_impl_db2.py b/ceilometer/tests/storage/test_impl_db2.py
index 549a2f5a..b80d7128 100644
--- a/ceilometer/tests/storage/test_impl_db2.py
+++ b/ceilometer/tests/storage/test_impl_db2.py
@@ -30,7 +30,7 @@ from ceilometer.storage.mongo import utils as pymongo_utils
 from ceilometer.tests import base as test_base
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 
 class CapabilitiesTest(test_base.BaseTestCase):
diff --git a/ceilometer/tests/storage/test_storage_scenarios.py b/ceilometer/tests/storage/test_storage_scenarios.py
index 51c7bca5..77ad8561 100644
--- a/ceilometer/tests/storage/test_storage_scenarios.py
+++ b/ceilometer/tests/storage/test_storage_scenarios.py
@@ -23,7 +23,7 @@ import datetime
 import operator
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import timeutils
 import pymongo
 
diff --git a/ceilometer/tests/test_collector.py b/ceilometer/tests/test_collector.py
index 8246e08f..8f6ca4bb 100644
--- a/ceilometer/tests/test_collector.py
+++ b/ceilometer/tests/test_collector.py
@@ -19,8 +19,8 @@ import socket
 
 import mock
 import msgpack
-from oslo.config import fixture as fixture_config
 import oslo.messaging
+from oslo_config import fixture as fixture_config
 from oslo_context import context
 from oslo_utils import timeutils
 from oslotest import mockpatch
diff --git a/ceilometer/tests/test_coordination.py b/ceilometer/tests/test_coordination.py
index 47a98bc0..99cac13a 100644
--- a/ceilometer/tests/test_coordination.py
+++ b/ceilometer/tests/test_coordination.py
@@ -18,7 +18,7 @@
 import logging
 
 import mock
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 import tooz.coordination
 
 from ceilometer import coordination
diff --git a/ceilometer/tests/test_messaging.py b/ceilometer/tests/test_messaging.py
index b42aabb4..1e89428a 100644
--- a/ceilometer/tests/test_messaging.py
+++ b/ceilometer/tests/test_messaging.py
@@ -13,8 +13,9 @@
 # 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 import fixture as fixture_config
+
 import oslo.messaging
+from oslo_config import fixture as fixture_config
 from oslotest import base
 
 from ceilometer import messaging
diff --git a/ceilometer/tests/test_middleware.py b/ceilometer/tests/test_middleware.py
index 3de5e593..92cebe82 100644
--- a/ceilometer/tests/test_middleware.py
+++ b/ceilometer/tests/test_middleware.py
@@ -15,7 +15,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import mock
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 
 from ceilometer import middleware
 from ceilometer.tests import base
diff --git a/ceilometer/tests/test_notification.py b/ceilometer/tests/test_notification.py
index 5ac6bfb8..557b810b 100644
--- a/ceilometer/tests/test_notification.py
+++ b/ceilometer/tests/test_notification.py
@@ -18,9 +18,9 @@
 
 import eventlet
 import mock
-from oslo.config import fixture as fixture_config
 import oslo.messaging
 import oslo.messaging.conffixture
+from oslo_config import fixture as fixture_config
 from oslo_context import context
 from oslo_utils import timeutils
 from stevedore import extension
diff --git a/ceilometer/tests/test_novaclient.py b/ceilometer/tests/test_novaclient.py
index 8cd4add3..fc24974b 100644
--- a/ceilometer/tests/test_novaclient.py
+++ b/ceilometer/tests/test_novaclient.py
@@ -18,7 +18,7 @@
 
 import mock
 import novaclient
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from oslotest import base
 from oslotest import mockpatch
 
diff --git a/ceilometer/utils.py b/ceilometer/utils.py
index 79b4b721..8701eb96 100644
--- a/ceilometer/utils.py
+++ b/ceilometer/utils.py
@@ -27,8 +27,8 @@ import hashlib
 import multiprocessing
 import struct
 
-from oslo.config import cfg
 from oslo_concurrency import processutils
+from oslo_config import cfg
 from oslo_utils import timeutils
 from oslo_utils import units
 import six
diff --git a/ceilometer/volume/notifications.py b/ceilometer/volume/notifications.py
index ea9638d4..f3eeb490 100644
--- a/ceilometer/volume/notifications.py
+++ b/ceilometer/volume/notifications.py
@@ -18,8 +18,8 @@
 events.
 """
 
-from oslo.config import cfg
 import oslo.messaging
+from oslo_config import cfg
 
 from ceilometer.agent import plugin_base
 from ceilometer import sample
diff --git a/tools/ceilometer-test-event.py b/tools/ceilometer-test-event.py
index b5c32627..66325cd2 100755
--- a/tools/ceilometer-test-event.py
+++ b/tools/ceilometer-test-event.py
@@ -25,7 +25,7 @@ you what events will be generated.
 import json
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 from stevedore import extension
 
 from ceilometer.event import converter
diff --git a/tools/make_test_data.py b/tools/make_test_data.py
index 456e60a0..dbd99624 100755
--- a/tools/make_test_data.py
+++ b/tools/make_test_data.py
@@ -35,7 +35,7 @@ import random
 import sys
 import uuid
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import timeutils
 
 from ceilometer.publisher import utils
diff --git a/tools/make_test_event_data.py b/tools/make_test_event_data.py
index d8a27ff3..6fd32a9e 100755
--- a/tools/make_test_event_data.py
+++ b/tools/make_test_event_data.py
@@ -30,7 +30,7 @@ import random
 import sys
 import uuid
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import timeutils
 
 from ceilometer.event.storage import models
diff --git a/tools/show_data.py b/tools/show_data.py
index e36bd3c8..cd965d36 100755
--- a/tools/show_data.py
+++ b/tools/show_data.py
@@ -19,7 +19,7 @@ from __future__ import print_function
 
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from ceilometer import storage
diff --git a/tools/test_hbase_table_utils.py b/tools/test_hbase_table_utils.py
index 209f9169..1c5444b9 100644
--- a/tools/test_hbase_table_utils.py
+++ b/tools/test_hbase_table_utils.py
@@ -13,7 +13,7 @@
 import os
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ceilometer import storage