diff --git a/ironic/api/__init__.py b/ironic/api/__init__.py
index e1963e664c..28ecbaa643 100644
--- a/ironic/api/__init__.py
+++ b/ironic/api/__init__.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 
 API_SERVICE_OPTS = [
diff --git a/ironic/api/app.py b/ironic/api/app.py
index 0b692201cf..21945165f1 100644
--- a/ironic/api/app.py
+++ b/ironic/api/app.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 pecan
 
 from ironic.api import acl
diff --git a/ironic/api/config.py b/ironic/api/config.py
index 5aa76f9c7b..0ea0a85251 100644
--- a/ironic/api/config.py
+++ b/ironic/api/config.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
 
 # Server Specific Configurations
 # See https://pecan.readthedocs.org/en/latest/configuration.html#server-configuration # noqa
diff --git a/ironic/api/controllers/v1/node.py b/ironic/api/controllers/v1/node.py
index bd40551bef..a7698aa724 100644
--- a/ironic/api/controllers/v1/node.py
+++ b/ironic/api/controllers/v1/node.py
@@ -15,7 +15,7 @@
 
 import datetime
 
-from oslo.config import cfg
+from oslo_config import cfg
 import pecan
 from pecan import rest
 import wsme
diff --git a/ironic/api/controllers/v1/utils.py b/ironic/api/controllers/v1/utils.py
index 27a6c531a0..aad05319d3 100644
--- a/ironic/api/controllers/v1/utils.py
+++ b/ironic/api/controllers/v1/utils.py
@@ -14,7 +14,7 @@
 #    under the License.
 
 import jsonpatch
-from oslo.config import cfg
+from oslo_config import cfg
 import wsme
 
 from ironic.common.i18n import _
diff --git a/ironic/api/hooks.py b/ironic/api/hooks.py
index 4af78b5e8e..0cf7142a31 100644
--- a/ironic/api/hooks.py
+++ b/ironic/api/hooks.py
@@ -16,7 +16,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from pecan import hooks
 from webob import exc
 
diff --git a/ironic/cmd/api.py b/ironic/cmd/api.py
index 8a4f4a5668..32fdd63852 100644
--- a/ironic/cmd/api.py
+++ b/ironic/cmd/api.py
@@ -21,7 +21,7 @@ import logging
 import sys
 from wsgiref import simple_server
 
-from oslo.config import cfg
+from oslo_config import cfg
 from six.moves import socketserver
 
 from ironic.api import app
diff --git a/ironic/cmd/conductor.py b/ironic/cmd/conductor.py
index ec0ea9b667..77c7cc3da5 100644
--- a/ironic/cmd/conductor.py
+++ b/ironic/cmd/conductor.py
@@ -21,7 +21,7 @@ The Ironic Management Service
 
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import service as ironic_service
 from ironic.openstack.common import service
diff --git a/ironic/cmd/dbsync.py b/ironic/cmd/dbsync.py
index c143f37033..3b5f50c091 100644
--- a/ironic/cmd/dbsync.py
+++ b/ironic/cmd/dbsync.py
@@ -21,7 +21,7 @@ Run storage database migration.
 
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import service
 from ironic.db import migration
diff --git a/ironic/common/config.py b/ironic/common/config.py
index aca1f07d9e..743b7d1ec0 100644
--- a/ironic/common/config.py
+++ b/ironic/common/config.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 ironic.common import rpc
 from ironic import version
diff --git a/ironic/common/dhcp_factory.py b/ironic/common/dhcp_factory.py
index 2053929895..24b10c88d5 100644
--- a/ironic/common/dhcp_factory.py
+++ b/ironic/common/dhcp_factory.py
@@ -12,8 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
 from oslo_concurrency import lockutils
+from oslo_config import cfg
 import stevedore
 
 from ironic.common import exception
diff --git a/ironic/common/disk_partitioner.py b/ironic/common/disk_partitioner.py
index e01c2ea2c3..4d334e4752 100644
--- a/ironic/common/disk_partitioner.py
+++ b/ironic/common/disk_partitioner.py
@@ -15,8 +15,8 @@
 
 import re
 
-from oslo.config import cfg
 from oslo_concurrency import processutils
+from oslo_config import cfg
 
 from ironic.common import exception
 from ironic.common.i18n import _
diff --git a/ironic/common/driver_factory.py b/ironic/common/driver_factory.py
index ce757460ef..421e1fb108 100644
--- a/ironic/common/driver_factory.py
+++ b/ironic/common/driver_factory.py
@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
 from oslo_concurrency import lockutils
+from oslo_config import cfg
 from stevedore import dispatch
 
 from ironic.common import exception
diff --git a/ironic/common/exception.py b/ironic/common/exception.py
index 2d0cbe2e14..e7fe777d93 100755
--- a/ironic/common/exception.py
+++ b/ironic/common/exception.py
@@ -22,7 +22,7 @@ SHOULD include dedicated exception logging.
 
 """
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from ironic.common.i18n import _
diff --git a/ironic/common/glance_service/base_image_service.py b/ironic/common/glance_service/base_image_service.py
index 7ef12bbbcd..1b646d5871 100644
--- a/ironic/common/glance_service/base_image_service.py
+++ b/ironic/common/glance_service/base_image_service.py
@@ -22,7 +22,7 @@ import sys
 import time
 
 from glanceclient import client
-from oslo.config import cfg
+from oslo_config import cfg
 import sendfile
 import six.moves.urllib.parse as urlparse
 
diff --git a/ironic/common/glance_service/service_utils.py b/ironic/common/glance_service/service_utils.py
index 74c5cddb2a..828f01c8b2 100644
--- a/ironic/common/glance_service/service_utils.py
+++ b/ironic/common/glance_service/service_utils.py
@@ -19,8 +19,8 @@ import itertools
 import logging
 import random
 
-from oslo.config import cfg
 from oslo.utils import timeutils
+from oslo_config import cfg
 from oslo_serialization import jsonutils
 import six
 import six.moves.urllib.parse as urlparse
diff --git a/ironic/common/glance_service/v2/image_service.py b/ironic/common/glance_service/v2/image_service.py
index cd835a9843..f5cb4b4e99 100644
--- a/ironic/common/glance_service/v2/image_service.py
+++ b/ironic/common/glance_service/v2/image_service.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from swiftclient import utils as swift_utils
 
 from ironic.common import exception as exc
diff --git a/ironic/common/hash_ring.py b/ironic/common/hash_ring.py
index 51ab38aa14..ed774626b4 100644
--- a/ironic/common/hash_ring.py
+++ b/ironic/common/hash_ring.py
@@ -17,7 +17,7 @@ import bisect
 import hashlib
 import threading
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import exception
 from ironic.common.i18n import _
diff --git a/ironic/common/image_service.py b/ironic/common/image_service.py
index 8d4f6de750..ee72dd68e0 100644
--- a/ironic/common/image_service.py
+++ b/ironic/common/image_service.py
@@ -15,8 +15,8 @@
 #    under the License.
 
 
-from oslo.config import cfg
 from oslo.utils import importutils
+from oslo_config import cfg
 
 
 glance_opts = [
diff --git a/ironic/common/images.py b/ironic/common/images.py
index cff9897b88..c898642521 100644
--- a/ironic/common/images.py
+++ b/ironic/common/images.py
@@ -23,8 +23,8 @@ import os
 import shutil
 
 import jinja2
-from oslo.config import cfg
 from oslo_concurrency import processutils
+from oslo_config import cfg
 
 from ironic.common import exception
 from ironic.common.i18n import _
diff --git a/ironic/common/keystone.py b/ironic/common/keystone.py
index 64ea34202c..6e9c07f4f3 100644
--- a/ironic/common/keystone.py
+++ b/ironic/common/keystone.py
@@ -13,9 +13,9 @@
 # under the License.
 
 from keystoneclient import exceptions as ksexception
-# NOTE(deva): import auth_token so oslo.config pulls in keystone_authtoken
+# NOTE(deva): import auth_token so oslo_config pulls in keystone_authtoken
 from keystonemiddleware import auth_token  # noqa
-from oslo.config import cfg
+from oslo_config import cfg
 from six.moves.urllib import parse
 
 from ironic.common import exception
diff --git a/ironic/common/paths.py b/ironic/common/paths.py
index f2116453a5..838583793b 100644
--- a/ironic/common/paths.py
+++ b/ironic/common/paths.py
@@ -17,7 +17,7 @@
 
 import os
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 path_opts = [
     cfg.StrOpt('pybasedir',
diff --git a/ironic/common/policy.py b/ironic/common/policy.py
index 381747aaab..cfacfc1f93 100644
--- a/ironic/common/policy.py
+++ b/ironic/common/policy.py
@@ -15,8 +15,8 @@
 
 """Policy Engine For Ironic."""
 
-from oslo.config import cfg
 from oslo_concurrency import lockutils
+from oslo_config import cfg
 
 from ironic.openstack.common import policy
 
diff --git a/ironic/common/pxe_utils.py b/ironic/common/pxe_utils.py
index f6e773d89f..7fce06088b 100644
--- a/ironic/common/pxe_utils.py
+++ b/ironic/common/pxe_utils.py
@@ -17,7 +17,7 @@
 import os
 
 import jinja2
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import dhcp_factory
 from ironic.common import exception
diff --git a/ironic/common/rpc.py b/ironic/common/rpc.py
index de6f98f55b..99bb055352 100644
--- a/ironic/common/rpc.py
+++ b/ironic/common/rpc.py
@@ -27,8 +27,8 @@ __all__ = [
     'TRANSPORT_ALIASES',
 ]
 
-from oslo.config import cfg
 from oslo import messaging
+from oslo_config import cfg
 from oslo_serialization import jsonutils
 
 from ironic.common import context as ironic_context
diff --git a/ironic/common/service.py b/ironic/common/service.py
index cef568650e..588da7b99a 100644
--- a/ironic/common/service.py
+++ b/ironic/common/service.py
@@ -18,9 +18,9 @@
 
 import socket
 
-from oslo.config import cfg
 from oslo import messaging
 from oslo.utils import importutils
+from oslo_config import cfg
 
 from ironic.common import config
 from ironic.common.i18n import _LE
diff --git a/ironic/common/swift.py b/ironic/common/swift.py
index d414ace94d..a4444e29fa 100644
--- a/ironic/common/swift.py
+++ b/ironic/common/swift.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 six.moves.urllib import parse
 from swiftclient import client as swift_client
 from swiftclient import exceptions as swift_exceptions
diff --git a/ironic/common/utils.py b/ironic/common/utils.py
index 926ef25dec..d5ed54416a 100644
--- a/ironic/common/utils.py
+++ b/ironic/common/utils.py
@@ -29,9 +29,9 @@ import tempfile
 import uuid
 
 import netaddr
-from oslo.config import cfg
 from oslo.utils import excutils
 from oslo_concurrency import processutils
+from oslo_config import cfg
 import paramiko
 import six
 
diff --git a/ironic/conductor/manager.py b/ironic/conductor/manager.py
index 90e2e426f4..c042afa373 100644
--- a/ironic/conductor/manager.py
+++ b/ironic/conductor/manager.py
@@ -48,10 +48,10 @@ import threading
 
 import eventlet
 from eventlet import greenpool
-from oslo.config import cfg
 from oslo import messaging
 from oslo.utils import excutils
 from oslo_concurrency import lockutils
+from oslo_config import cfg
 from oslo_db import exception as db_exception
 
 from ironic.common import dhcp_factory
diff --git a/ironic/conductor/task_manager.py b/ironic/conductor/task_manager.py
index cd0ac4d14a..d921876f5f 100644
--- a/ironic/conductor/task_manager.py
+++ b/ironic/conductor/task_manager.py
@@ -96,8 +96,8 @@ raised in the background thread.):
 
 import functools
 
-from oslo.config import cfg
 from oslo.utils import excutils
+from oslo_config import cfg
 import retrying
 
 from ironic.common import driver_factory
diff --git a/ironic/db/api.py b/ironic/db/api.py
index c139b0335d..a5ba7b9b8b 100644
--- a/ironic/db/api.py
+++ b/ironic/db/api.py
@@ -19,7 +19,7 @@ Base classes for storage engines
 
 import abc
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_db import api as db_api
 import six
 
diff --git a/ironic/db/migration.py b/ironic/db/migration.py
index 6dc59906b1..2cc6e5bda4 100644
--- a/ironic/db/migration.py
+++ b/ironic/db/migration.py
@@ -16,7 +16,7 @@
 
 """Database setup and migration commands."""
 
-from oslo.config import cfg
+from oslo_config import cfg
 from stevedore import driver
 
 _IMPL = None
diff --git a/ironic/db/sqlalchemy/api.py b/ironic/db/sqlalchemy/api.py
index a919c59b61..7b481735bf 100644
--- a/ironic/db/sqlalchemy/api.py
+++ b/ironic/db/sqlalchemy/api.py
@@ -19,8 +19,8 @@
 import collections
 import datetime
 
-from oslo.config import cfg
 from oslo.utils import timeutils
+from oslo_config import cfg
 from oslo_db import exception as db_exc
 from oslo_db.sqlalchemy import session as db_session
 from oslo_db.sqlalchemy import utils as db_utils
diff --git a/ironic/db/sqlalchemy/models.py b/ironic/db/sqlalchemy/models.py
index 186e416fd3..1629ab6f37 100644
--- a/ironic/db/sqlalchemy/models.py
+++ b/ironic/db/sqlalchemy/models.py
@@ -20,7 +20,7 @@ SQLAlchemy models for baremetal data.
 
 import json
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_db import options as db_options
 from oslo_db.sqlalchemy import models
 import six.moves.urllib.parse as urlparse
diff --git a/ironic/dhcp/neutron.py b/ironic/dhcp/neutron.py
index 9c78966ce9..13f00f1d1d 100644
--- a/ironic/dhcp/neutron.py
+++ b/ironic/dhcp/neutron.py
@@ -18,8 +18,8 @@ import time
 
 from neutronclient.common import exceptions as neutron_client_exc
 from neutronclient.v2_0 import client as clientv20
-from oslo.config import cfg
 from oslo.utils import netutils
+from oslo_config import cfg
 
 from ironic.common import exception
 from ironic.common.i18n import _
diff --git a/ironic/drivers/modules/agent.py b/ironic/drivers/modules/agent.py
index 166eb59d55..2bac1f2e6c 100644
--- a/ironic/drivers/modules/agent.py
+++ b/ironic/drivers/modules/agent.py
@@ -15,8 +15,8 @@
 import os
 import time
 
-from oslo.config import cfg
 from oslo.utils import excutils
+from oslo_config import cfg
 
 from ironic.common import dhcp_factory
 from ironic.common import exception
diff --git a/ironic/drivers/modules/agent_client.py b/ironic/drivers/modules/agent_client.py
index 5b848ad9ea..bdfe9d826a 100644
--- a/ironic/drivers/modules/agent_client.py
+++ b/ironic/drivers/modules/agent_client.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_serialization import jsonutils
 import requests
 
diff --git a/ironic/drivers/modules/console_utils.py b/ironic/drivers/modules/console_utils.py
index e19fe40c4c..58d8857c0c 100644
--- a/ironic/drivers/modules/console_utils.py
+++ b/ironic/drivers/modules/console_utils.py
@@ -24,9 +24,9 @@ import subprocess
 import tempfile
 import time
 
-from oslo.config import cfg
 from oslo.utils import netutils
 from oslo_concurrency import processutils
+from oslo_config import cfg
 
 from ironic.common import exception
 from ironic.common.i18n import _
diff --git a/ironic/drivers/modules/deploy_utils.py b/ironic/drivers/modules/deploy_utils.py
index 3b01172b5c..0eafc6fa5d 100644
--- a/ironic/drivers/modules/deploy_utils.py
+++ b/ironic/drivers/modules/deploy_utils.py
@@ -25,10 +25,10 @@ import stat
 import tempfile
 import time
 
-from oslo.config import cfg
 from oslo.utils import excutils
 from oslo.utils import units
 from oslo_concurrency import processutils
+from oslo_config import cfg
 import requests
 import six
 
diff --git a/ironic/drivers/modules/ilo/common.py b/ironic/drivers/modules/ilo/common.py
index fda75bf1ad..807e89b475 100644
--- a/ironic/drivers/modules/ilo/common.py
+++ b/ironic/drivers/modules/ilo/common.py
@@ -18,8 +18,8 @@ Common functionalities shared between different iLO modules.
 
 import tempfile
 
-from oslo.config import cfg
 from oslo.utils import importutils
+from oslo_config import cfg
 
 from ironic.common import exception
 from ironic.common.i18n import _
diff --git a/ironic/drivers/modules/ilo/deploy.py b/ironic/drivers/modules/ilo/deploy.py
index a75f0f445d..cb7d1fa3bc 100644
--- a/ironic/drivers/modules/ilo/deploy.py
+++ b/ironic/drivers/modules/ilo/deploy.py
@@ -17,7 +17,7 @@ iLO Deploy Driver(s) and supporting methods.
 
 import tempfile
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import boot_devices
 from ironic.common import exception
diff --git a/ironic/drivers/modules/ilo/power.py b/ironic/drivers/modules/ilo/power.py
index dd67ce8f6a..69d5b22bad 100644
--- a/ironic/drivers/modules/ilo/power.py
+++ b/ironic/drivers/modules/ilo/power.py
@@ -16,8 +16,8 @@
 iLO Power Driver
 """
 
-from oslo.config import cfg
 from oslo.utils import importutils
+from oslo_config import cfg
 
 from ironic.common import boot_devices
 from ironic.common import exception
diff --git a/ironic/drivers/modules/image_cache.py b/ironic/drivers/modules/image_cache.py
index 7e1fdfe57f..d937e273fd 100644
--- a/ironic/drivers/modules/image_cache.py
+++ b/ironic/drivers/modules/image_cache.py
@@ -22,8 +22,8 @@ import os
 import tempfile
 import time
 
-from oslo.config import cfg
 from oslo_concurrency import lockutils
+from oslo_config import cfg
 
 from ironic.common import exception
 from ironic.common.glance_service import service_utils
diff --git a/ironic/drivers/modules/ipminative.py b/ironic/drivers/modules/ipminative.py
index c629b39766..fa13665896 100644
--- a/ironic/drivers/modules/ipminative.py
+++ b/ironic/drivers/modules/ipminative.py
@@ -22,9 +22,9 @@ Ironic Native IPMI power manager.
 import os
 import tempfile
 
-from oslo.config import cfg
 from oslo.utils import excutils
 from oslo.utils import importutils
+from oslo_config import cfg
 
 from ironic.common import boot_devices
 from ironic.common import exception
diff --git a/ironic/drivers/modules/ipmitool.py b/ironic/drivers/modules/ipmitool.py
index 7dde2a6e5d..61371a125c 100644
--- a/ironic/drivers/modules/ipmitool.py
+++ b/ironic/drivers/modules/ipmitool.py
@@ -36,9 +36,9 @@ import stat
 import tempfile
 import time
 
-from oslo.config import cfg
 from oslo.utils import excutils
 from oslo_concurrency import processutils
+from oslo_config import cfg
 
 from ironic.common import boot_devices
 from ironic.common import exception
diff --git a/ironic/drivers/modules/irmc/common.py b/ironic/drivers/modules/irmc/common.py
index 4ecb96004e..f8ba44db6f 100644
--- a/ironic/drivers/modules/irmc/common.py
+++ b/ironic/drivers/modules/irmc/common.py
@@ -15,8 +15,8 @@
 Common functionalities shared between different iRMC modules.
 """
 
-from oslo.config import cfg
 from oslo.utils import importutils
+from oslo_config import cfg
 
 from ironic.common import exception
 from ironic.common.i18n import _
diff --git a/ironic/drivers/modules/irmc/power.py b/ironic/drivers/modules/irmc/power.py
index 75b6651c3c..f650d609a8 100644
--- a/ironic/drivers/modules/irmc/power.py
+++ b/ironic/drivers/modules/irmc/power.py
@@ -14,8 +14,8 @@
 """
 iRMC Power Driver using the Base Server Profile
 """
-from oslo.config import cfg
 from oslo.utils import importutils
+from oslo_config import cfg
 
 from ironic.common import exception
 from ironic.common.i18n import _
diff --git a/ironic/drivers/modules/iscsi_deploy.py b/ironic/drivers/modules/iscsi_deploy.py
index e99ef0e729..3aeacbb0a2 100644
--- a/ironic/drivers/modules/iscsi_deploy.py
+++ b/ironic/drivers/modules/iscsi_deploy.py
@@ -15,8 +15,8 @@
 
 import os
 
-from oslo.config import cfg
 from oslo.utils import strutils
+from oslo_config import cfg
 import six
 from six.moves.urllib import parse
 
diff --git a/ironic/drivers/modules/pxe.py b/ironic/drivers/modules/pxe.py
index 757c5e5796..80097803be 100644
--- a/ironic/drivers/modules/pxe.py
+++ b/ironic/drivers/modules/pxe.py
@@ -20,7 +20,7 @@ PXE Driver and supporting meta-classes.
 import os
 import shutil
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import dhcp_factory
 from ironic.common import exception
diff --git a/ironic/drivers/modules/seamicro.py b/ironic/drivers/modules/seamicro.py
index e9563344b9..8f72c10aab 100644
--- a/ironic/drivers/modules/seamicro.py
+++ b/ironic/drivers/modules/seamicro.py
@@ -21,8 +21,8 @@ Provides vendor passthru methods for SeaMicro specific functionality.
 import os
 import re
 
-from oslo.config import cfg
 from oslo.utils import importutils
+from oslo_config import cfg
 from six.moves.urllib import parse as urlparse
 
 from ironic.common import boot_devices
diff --git a/ironic/drivers/modules/snmp.py b/ironic/drivers/modules/snmp.py
index 140e2490e6..f1274535f8 100644
--- a/ironic/drivers/modules/snmp.py
+++ b/ironic/drivers/modules/snmp.py
@@ -29,8 +29,8 @@ models.
 
 import abc
 
-from oslo.config import cfg
 from oslo.utils import importutils
+from oslo_config import cfg
 import six
 
 from ironic.common import exception
diff --git a/ironic/drivers/modules/ssh.py b/ironic/drivers/modules/ssh.py
index a8b346f6e1..2adb59755b 100644
--- a/ironic/drivers/modules/ssh.py
+++ b/ironic/drivers/modules/ssh.py
@@ -28,8 +28,8 @@ Currently supported environments are:
 
 import os
 
-from oslo.config import cfg
 from oslo_concurrency import processutils
+from oslo_config import cfg
 
 from ironic.common import boot_devices
 from ironic.common import exception
diff --git a/ironic/migrate_nova/migrate_db.py b/ironic/migrate_nova/migrate_db.py
index 51f5e816b4..3e135f56f9 100644
--- a/ironic/migrate_nova/migrate_db.py
+++ b/ironic/migrate_nova/migrate_db.py
@@ -218,7 +218,7 @@ def parse_nova_config(config_file):
     """Parse nova.conf and return known defaults if setting is not present.
 
     This avoids having to import nova code from this script and risk conflicts
-    with Ironic's tree around oslo.config resources.
+    with Ironic's tree around oslo_config resources.
     """
     if not os.path.isfile(config_file):
         print("nova.conf not found at %s. Please specify the location via "
diff --git a/ironic/netconf.py b/ironic/netconf.py
index a40629af76..b4a76a09fc 100644
--- a/ironic/netconf.py
+++ b/ironic/netconf.py
@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
 from oslo.utils import netutils
+from oslo_config import cfg
 
 CONF = cfg.CONF
 
diff --git a/ironic/tests/api/base.py b/ironic/tests/api/base.py
index e9de0c1735..b9178069ba 100644
--- a/ironic/tests/api/base.py
+++ b/ironic/tests/api/base.py
@@ -23,7 +23,7 @@
 # NOTE(deva): import auth_token so we can override a config option
 from keystonemiddleware import auth_token  # noqa
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 import pecan
 import pecan.testing
 from six.moves.urllib import parse as urlparse
diff --git a/ironic/tests/api/test_acl.py b/ironic/tests/api/test_acl.py
index d89a685dae..0b60387d8b 100644
--- a/ironic/tests/api/test_acl.py
+++ b/ironic/tests/api/test_acl.py
@@ -19,7 +19,7 @@ are blocked or allowed to be processed.
 # NOTE(deva): import auth_token so we can override a config option
 from keystonemiddleware import auth_token  # noqa
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.tests.api import base
 from ironic.tests.api import utils
diff --git a/ironic/tests/api/test_hooks.py b/ironic/tests/api/test_hooks.py
index a4f73396c9..89e2fc48b6 100644
--- a/ironic/tests/api/test_hooks.py
+++ b/ironic/tests/api/test_hooks.py
@@ -17,8 +17,8 @@
 import json
 
 import mock
-from oslo.config import cfg
 from oslo import messaging
+from oslo_config import cfg
 from webob import exc as webob_exc
 
 from ironic.api.controllers import root
diff --git a/ironic/tests/api/v1/test_chassis.py b/ironic/tests/api/v1/test_chassis.py
index 6ba1300133..597fea76d8 100644
--- a/ironic/tests/api/v1/test_chassis.py
+++ b/ironic/tests/api/v1/test_chassis.py
@@ -18,8 +18,8 @@ Tests for the API /chassis/ methods.
 import datetime
 
 import mock
-from oslo.config import cfg
 from oslo.utils import timeutils
+from oslo_config import cfg
 from six.moves.urllib import parse as urlparse
 from wsme import types as wtypes
 
diff --git a/ironic/tests/api/v1/test_nodes.py b/ironic/tests/api/v1/test_nodes.py
index 50fd769be5..ecf2779b4b 100644
--- a/ironic/tests/api/v1/test_nodes.py
+++ b/ironic/tests/api/v1/test_nodes.py
@@ -19,8 +19,8 @@ import datetime
 import json
 
 import mock
-from oslo.config import cfg
 from oslo.utils import timeutils
+from oslo_config import cfg
 from six.moves.urllib import parse as urlparse
 from testtools.matchers import HasLength
 from wsme import types as wtypes
diff --git a/ironic/tests/api/v1/test_ports.py b/ironic/tests/api/v1/test_ports.py
index bb0d4b85e2..25b3c3bc28 100644
--- a/ironic/tests/api/v1/test_ports.py
+++ b/ironic/tests/api/v1/test_ports.py
@@ -18,8 +18,8 @@ Tests for the API /ports/ methods.
 import datetime
 
 import mock
-from oslo.config import cfg
 from oslo.utils import timeutils
+from oslo_config import cfg
 from six.moves.urllib import parse as urlparse
 from testtools.matchers import HasLength
 from wsme import types as wtypes
diff --git a/ironic/tests/api/v1/test_utils.py b/ironic/tests/api/v1/test_utils.py
index a2404166ce..dda776b970 100644
--- a/ironic/tests/api/v1/test_utils.py
+++ b/ironic/tests/api/v1/test_utils.py
@@ -18,7 +18,7 @@ import wsme
 from ironic.api.controllers.v1 import utils
 from ironic.tests import base
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 CONF = cfg.CONF
 
diff --git a/ironic/tests/base.py b/ironic/tests/base.py
index 3d63597f83..2caee82d77 100644
--- a/ironic/tests/base.py
+++ b/ironic/tests/base.py
@@ -28,7 +28,7 @@ import sys
 import eventlet
 eventlet.monkey_patch(os=False)
 import fixtures
-from oslo.config import cfg
+from oslo_config import cfg
 import testtools
 
 from ironic.common import hash_ring
diff --git a/ironic/tests/conductor/test_manager.py b/ironic/tests/conductor/test_manager.py
index 24765c8339..49fc7bddd0 100644
--- a/ironic/tests/conductor/test_manager.py
+++ b/ironic/tests/conductor/test_manager.py
@@ -22,8 +22,8 @@ import datetime
 
 import eventlet
 import mock
-from oslo.config import cfg
 from oslo import messaging
+from oslo_config import cfg
 from oslo_db import exception as db_exception
 
 from ironic.common import boot_devices
diff --git a/ironic/tests/conductor/test_rpcapi.py b/ironic/tests/conductor/test_rpcapi.py
index d0fabe441b..8d688f152a 100644
--- a/ironic/tests/conductor/test_rpcapi.py
+++ b/ironic/tests/conductor/test_rpcapi.py
@@ -21,7 +21,7 @@ Unit Tests for :py:class:`ironic.conductor.rpcapi.ConductorAPI`.
 import copy
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import boot_devices
 from ironic.common import exception
diff --git a/ironic/tests/conf_fixture.py b/ironic/tests/conf_fixture.py
index f98d70c00a..42132f882c 100644
--- a/ironic/tests/conf_fixture.py
+++ b/ironic/tests/conf_fixture.py
@@ -15,7 +15,7 @@
 #    under the License.
 
 import fixtures
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import config
 
diff --git a/ironic/tests/db/base.py b/ironic/tests/db/base.py
index c5c76b2d94..653ac949fe 100644
--- a/ironic/tests/db/base.py
+++ b/ironic/tests/db/base.py
@@ -19,7 +19,7 @@ import os
 import shutil
 
 import fixtures
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import paths
 from ironic.db import api as dbapi
diff --git a/ironic/tests/drivers/ilo/test_common.py b/ironic/tests/drivers/ilo/test_common.py
index fac42f08b5..908e7c404b 100644
--- a/ironic/tests/drivers/ilo/test_common.py
+++ b/ironic/tests/drivers/ilo/test_common.py
@@ -18,8 +18,8 @@
 import tempfile
 
 import mock
-from oslo.config import cfg
 from oslo.utils import importutils
+from oslo_config import cfg
 
 from ironic.common import exception
 from ironic.common import images
diff --git a/ironic/tests/drivers/ilo/test_deploy.py b/ironic/tests/drivers/ilo/test_deploy.py
index 807adf5e12..e07c869123 100644
--- a/ironic/tests/drivers/ilo/test_deploy.py
+++ b/ironic/tests/drivers/ilo/test_deploy.py
@@ -18,7 +18,7 @@
 import tempfile
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import boot_devices
 from ironic.common import exception
diff --git a/ironic/tests/drivers/ilo/test_management.py b/ironic/tests/drivers/ilo/test_management.py
index a01abd026e..e1bf5431a2 100644
--- a/ironic/tests/drivers/ilo/test_management.py
+++ b/ironic/tests/drivers/ilo/test_management.py
@@ -16,8 +16,8 @@
 """Test class for Management Interface used by iLO modules."""
 
 import mock
-from oslo.config import cfg
 from oslo.utils import importutils
+from oslo_config import cfg
 
 from ironic.common import boot_devices
 from ironic.common import exception
diff --git a/ironic/tests/drivers/ilo/test_power.py b/ironic/tests/drivers/ilo/test_power.py
index a80ff7e7e6..b31ae1067c 100644
--- a/ironic/tests/drivers/ilo/test_power.py
+++ b/ironic/tests/drivers/ilo/test_power.py
@@ -16,8 +16,8 @@
 """Test class for IloPower module."""
 
 import mock
-from oslo.config import cfg
 from oslo.utils import importutils
+from oslo_config import cfg
 
 from ironic.common import boot_devices
 from ironic.common import exception
diff --git a/ironic/tests/drivers/irmc/test_common.py b/ironic/tests/drivers/irmc/test_common.py
index 288c4e7a8f..8de686fcd3 100644
--- a/ironic/tests/drivers/irmc/test_common.py
+++ b/ironic/tests/drivers/irmc/test_common.py
@@ -16,7 +16,7 @@ Test class for common methods used by iRMC modules.
 """
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import exception
 from ironic.conductor import task_manager
diff --git a/ironic/tests/drivers/irmc/test_power.py b/ironic/tests/drivers/irmc/test_power.py
index 85bf10f1bc..9dcb81a010 100644
--- a/ironic/tests/drivers/irmc/test_power.py
+++ b/ironic/tests/drivers/irmc/test_power.py
@@ -16,7 +16,7 @@ Test class for iRMC Power Driver
 """
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import exception
 from ironic.common import states
diff --git a/ironic/tests/drivers/test_agent.py b/ironic/tests/drivers/test_agent.py
index 8897d5376c..fceb17c37a 100644
--- a/ironic/tests/drivers/test_agent.py
+++ b/ironic/tests/drivers/test_agent.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import dhcp_factory
 from ironic.common import exception
diff --git a/ironic/tests/drivers/test_console_utils.py b/ironic/tests/drivers/test_console_utils.py
index fbe75cc131..da9e1557eb 100644
--- a/ironic/tests/drivers/test_console_utils.py
+++ b/ironic/tests/drivers/test_console_utils.py
@@ -24,9 +24,9 @@ import subprocess
 import tempfile
 
 import mock
-from oslo.config import cfg
 from oslo.utils import netutils
 from oslo_concurrency import processutils
+from oslo_config import cfg
 
 from ironic.common import exception
 from ironic.common import utils
diff --git a/ironic/tests/drivers/test_deploy_utils.py b/ironic/tests/drivers/test_deploy_utils.py
index d619cdcc06..29d3da1878 100644
--- a/ironic/tests/drivers/test_deploy_utils.py
+++ b/ironic/tests/drivers/test_deploy_utils.py
@@ -22,8 +22,8 @@ import tempfile
 
 import fixtures
 import mock
-from oslo.config import cfg
 from oslo_concurrency import processutils
+from oslo_config import cfg
 import requests
 
 from ironic.common import disk_partitioner
diff --git a/ironic/tests/drivers/test_ipminative.py b/ironic/tests/drivers/test_ipminative.py
index df1b856cfe..b6b77a2bae 100644
--- a/ironic/tests/drivers/test_ipminative.py
+++ b/ironic/tests/drivers/test_ipminative.py
@@ -20,7 +20,7 @@ Test class for Native IPMI power driver module.
 """
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from pyghmi import exceptions as pyghmi_exception
 
 from ironic.common import boot_devices
diff --git a/ironic/tests/drivers/test_ipmitool.py b/ironic/tests/drivers/test_ipmitool.py
index fe0a69fcfb..396a9de663 100644
--- a/ironic/tests/drivers/test_ipmitool.py
+++ b/ironic/tests/drivers/test_ipmitool.py
@@ -25,8 +25,8 @@ import tempfile
 import time
 
 import mock
-from oslo.config import cfg
 from oslo_concurrency import processutils
+from oslo_config import cfg
 
 from ironic.common import boot_devices
 from ironic.common import driver_factory
diff --git a/ironic/tests/drivers/test_iscsi_deploy.py b/ironic/tests/drivers/test_iscsi_deploy.py
index cc8cc1d756..7a00917708 100644
--- a/ironic/tests/drivers/test_iscsi_deploy.py
+++ b/ironic/tests/drivers/test_iscsi_deploy.py
@@ -19,7 +19,7 @@ import os
 import tempfile
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import exception
 from ironic.common import keystone
diff --git a/ironic/tests/drivers/test_pxe.py b/ironic/tests/drivers/test_pxe.py
index 4abcb6da7e..8d93f2d46e 100644
--- a/ironic/tests/drivers/test_pxe.py
+++ b/ironic/tests/drivers/test_pxe.py
@@ -22,7 +22,7 @@ import tempfile
 
 import fixtures
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_serialization import jsonutils as json
 
 from ironic.common import dhcp_factory
diff --git a/ironic/tests/drivers/test_snmp.py b/ironic/tests/drivers/test_snmp.py
index eaf368798b..3f3992224f 100644
--- a/ironic/tests/drivers/test_snmp.py
+++ b/ironic/tests/drivers/test_snmp.py
@@ -21,7 +21,7 @@
 """Test class for SNMP power driver module."""
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from pysnmp.entity.rfc3413.oneliner import cmdgen
 from pysnmp import error as snmp_error
 
diff --git a/ironic/tests/drivers/test_ssh.py b/ironic/tests/drivers/test_ssh.py
index b8421e5642..fa67783b09 100644
--- a/ironic/tests/drivers/test_ssh.py
+++ b/ironic/tests/drivers/test_ssh.py
@@ -17,8 +17,8 @@
 
 import fixtures
 import mock
-from oslo.config import cfg
 from oslo_concurrency import processutils
+from oslo_config import cfg
 import paramiko
 
 from ironic.common import boot_devices
diff --git a/ironic/tests/policy_fixture.py b/ironic/tests/policy_fixture.py
index f02758dfe3..47b8b3e4dd 100644
--- a/ironic/tests/policy_fixture.py
+++ b/ironic/tests/policy_fixture.py
@@ -15,7 +15,7 @@
 import os
 
 import fixtures
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import policy as ironic_policy
 from ironic.tests import fake_policy
diff --git a/ironic/tests/test_glance_service.py b/ironic/tests/test_glance_service.py
index 461f6a0178..ce1d44f88c 100644
--- a/ironic/tests/test_glance_service.py
+++ b/ironic/tests/test_glance_service.py
@@ -32,7 +32,7 @@ from ironic.tests import base
 from ironic.tests import matchers
 from ironic.tests import stubs
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_serialization import jsonutils
 
 CONF = cfg.CONF
diff --git a/ironic/tests/test_hash_ring.py b/ironic/tests/test_hash_ring.py
index 414da9432c..54a4ca0d33 100644
--- a/ironic/tests/test_hash_ring.py
+++ b/ironic/tests/test_hash_ring.py
@@ -16,7 +16,7 @@
 import hashlib
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from testtools import matchers
 
 from ironic.common import exception
diff --git a/ironic/tests/test_images.py b/ironic/tests/test_images.py
index 7ebfbe475c..851cd34e1e 100644
--- a/ironic/tests/test_images.py
+++ b/ironic/tests/test_images.py
@@ -20,8 +20,8 @@ import os
 import shutil
 
 import mock
-from oslo.config import cfg
 from oslo_concurrency import processutils
+from oslo_config import cfg
 import six.moves.builtins as __builtin__
 
 from ironic.common import exception
diff --git a/ironic/tests/test_pxe_utils.py b/ironic/tests/test_pxe_utils.py
index 40f55cf58c..a170418e78 100644
--- a/ironic/tests/test_pxe_utils.py
+++ b/ironic/tests/test_pxe_utils.py
@@ -17,7 +17,7 @@
 import os
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ironic.common import pxe_utils
 from ironic.conductor import task_manager
diff --git a/ironic/tests/test_swift.py b/ironic/tests/test_swift.py
index c432e578c4..07af106568 100644
--- a/ironic/tests/test_swift.py
+++ b/ironic/tests/test_swift.py
@@ -16,7 +16,7 @@ import __builtin__
 import sys
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from swiftclient import client as swift_client
 from swiftclient import exceptions as swift_exception
 from swiftclient import utils as swift_utils
diff --git a/ironic/tests/test_utils.py b/ironic/tests/test_utils.py
index 02164fdb85..afe3793677 100644
--- a/ironic/tests/test_utils.py
+++ b/ironic/tests/test_utils.py
@@ -23,8 +23,8 @@ import uuid
 
 import mock
 import netaddr
-from oslo.config import cfg
 from oslo_concurrency import processutils
+from oslo_config import cfg
 import six
 import six.moves.builtins as __builtin__