diff --git a/glance/api/__init__.py b/glance/api/__init__.py
index bd60c19e3f..eaeec57225 100644
--- a/glance/api/__init__.py
+++ b/glance/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
 import paste.urlmap
 
 CONF = cfg.CONF
diff --git a/glance/api/common.py b/glance/api/common.py
index a61ab683d2..a2bfbc12ce 100644
--- a/glance/api/common.py
+++ b/glance/api/common.py
@@ -15,7 +15,7 @@
 
 import re
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import excutils
 from oslo_utils import units
 
diff --git a/glance/api/middleware/context.py b/glance/api/middleware/context.py
index 22efebf9ca..68b669265d 100644
--- a/glance/api/middleware/context.py
+++ b/glance/api/middleware/context.py
@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
 from oslo.serialization import jsonutils
+from oslo_config import cfg
 import webob.exc
 
 from glance.api import policy
diff --git a/glance/api/middleware/version_negotiation.py b/glance/api/middleware/version_negotiation.py
index 6f60b43a94..043ac2d0f2 100644
--- a/glance/api/middleware/version_negotiation.py
+++ b/glance/api/middleware/version_negotiation.py
@@ -19,7 +19,7 @@ and/or Accept headers and attempts to negotiate an API controller to
 return
 """
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from glance.api import versions
 from glance.common import wsgi
diff --git a/glance/api/policy.py b/glance/api/policy.py
index c6257e5a81..0506a79225 100755
--- a/glance/api/policy.py
+++ b/glance/api/policy.py
@@ -18,7 +18,7 @@
 
 import copy
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from glance.common import exception
 import glance.domain.proxy
diff --git a/glance/api/v1/images.py b/glance/api/v1/images.py
index b8496be607..292effd0db 100644
--- a/glance/api/v1/images.py
+++ b/glance/api/v1/images.py
@@ -22,7 +22,7 @@ import copy
 import eventlet
 import glance_store as store
 import glance_store.location
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import excutils
 from oslo_utils import strutils
 from webob.exc import HTTPBadRequest
diff --git a/glance/api/v1/members.py b/glance/api/v1/members.py
index 3edc0bb613..3180ee6b99 100644
--- a/glance/api/v1/members.py
+++ b/glance/api/v1/members.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 webob.exc
 
 from glance.api import policy
diff --git a/glance/api/v1/upload_utils.py b/glance/api/v1/upload_utils.py
index 880f6a6e44..b10d868f48 100644
--- a/glance/api/v1/upload_utils.py
+++ b/glance/api/v1/upload_utils.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 import glance_store as store_api
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import excutils
 import webob.exc
 
diff --git a/glance/api/v2/images.py b/glance/api/v2/images.py
index 4c3888ca33..2b02228bd7 100644
--- a/glance/api/v2/images.py
+++ b/glance/api/v2/images.py
@@ -16,8 +16,8 @@
 import re
 
 import glance_store
-from oslo.config import cfg
 from oslo.serialization import jsonutils as json
+from oslo_config import cfg
 from oslo_utils import timeutils
 import six
 import six.moves.urllib.parse as urlparse
diff --git a/glance/api/v2/metadef_namespaces.py b/glance/api/v2/metadef_namespaces.py
index 2cb1bacc5e..73b59581de 100644
--- a/glance/api/v2/metadef_namespaces.py
+++ b/glance/api/v2/metadef_namespaces.py
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
 from oslo.serialization import jsonutils
+from oslo_config import cfg
 import six
 import six.moves.urllib.parse as urlparse
 import webob.exc
diff --git a/glance/api/v2/metadef_objects.py b/glance/api/v2/metadef_objects.py
index a23fc18b9d..1510119975 100644
--- a/glance/api/v2/metadef_objects.py
+++ b/glance/api/v2/metadef_objects.py
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
 from oslo.serialization import jsonutils
+from oslo_config import cfg
 import six
 import webob.exc
 from wsme.rest import json
diff --git a/glance/api/v2/metadef_tags.py b/glance/api/v2/metadef_tags.py
index bdd363c6da..2360188da0 100644
--- a/glance/api/v2/metadef_tags.py
+++ b/glance/api/v2/metadef_tags.py
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
 from oslo.serialization import jsonutils
+from oslo_config import cfg
 import six
 import webob.exc
 from wsme.rest import json
diff --git a/glance/api/v2/tasks.py b/glance/api/v2/tasks.py
index bc0b77f2c1..c4bd4c9cfd 100644
--- a/glance/api/v2/tasks.py
+++ b/glance/api/v2/tasks.py
@@ -17,8 +17,8 @@
 import copy
 
 import glance_store
-from oslo.config import cfg
 import oslo.serialization.jsonutils as json
+from oslo_config import cfg
 from oslo_utils import timeutils
 import six
 import six.moves.urllib.parse as urlparse
diff --git a/glance/api/versions.py b/glance/api/versions.py
index 4e2ca6cf2d..17361301b3 100644
--- a/glance/api/versions.py
+++ b/glance/api/versions.py
@@ -15,8 +15,8 @@
 
 import httplib
 
-from oslo.config import cfg
 from oslo.serialization import jsonutils
+from oslo_config import cfg
 import webob.dec
 
 from glance.common import wsgi
diff --git a/glance/async/eventlet_executor.py b/glance/async/eventlet_executor.py
index 8b7b2bd7a4..41884f9ae1 100644
--- a/glance/async/eventlet_executor.py
+++ b/glance/async/eventlet_executor.py
@@ -14,8 +14,8 @@
 #    under the License.
 
 import eventlet
-from oslo.config import cfg
 from oslo_concurrency import lockutils
+from oslo_config import cfg
 
 import glance.async
 import glance.common.scripts as scripts
diff --git a/glance/cmd/api.py b/glance/cmd/api.py
index a805a1ba29..18e22628b9 100755
--- a/glance/cmd/api.py
+++ b/glance/cmd/api.py
@@ -41,7 +41,7 @@ if os.path.exists(os.path.join(possible_topdir, 'glance', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
 import glance_store
-from oslo.config import cfg
+from oslo_config import cfg
 import osprofiler.notifier
 import osprofiler.web
 
diff --git a/glance/cmd/control.py b/glance/cmd/control.py
index 4a60572ae1..fe3464a77f 100644
--- a/glance/cmd/control.py
+++ b/glance/cmd/control.py
@@ -39,7 +39,7 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(possible_topdir, 'glance', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import units
 from six.moves import xrange
 
diff --git a/glance/cmd/manage.py b/glance/cmd/manage.py
index 8d60af1df5..e2b47e62dc 100755
--- a/glance/cmd/manage.py
+++ b/glance/cmd/manage.py
@@ -38,8 +38,8 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(possible_topdir, 'glance', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
-from oslo.config import cfg
 from oslo.db.sqlalchemy import migration
+from oslo_config import cfg
 from oslo_utils import encodeutils
 
 from glance.common import config
diff --git a/glance/cmd/registry.py b/glance/cmd/registry.py
index ba65313980..a3a6a98154 100755
--- a/glance/cmd/registry.py
+++ b/glance/cmd/registry.py
@@ -37,7 +37,7 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(possible_topdir, 'glance', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
-from oslo.config import cfg
+from oslo_config import cfg
 import osprofiler.notifier
 import osprofiler.web
 
diff --git a/glance/cmd/scrubber.py b/glance/cmd/scrubber.py
index 850a1851be..2cfe297949 100755
--- a/glance/cmd/scrubber.py
+++ b/glance/cmd/scrubber.py
@@ -31,7 +31,7 @@ if os.path.exists(os.path.join(possible_topdir, 'glance', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
 import glance_store
-from oslo.config import cfg
+from oslo_config import cfg
 
 from glance.common import config
 from glance.openstack.common import log
diff --git a/glance/common/config.py b/glance/common/config.py
index 81683438de..549551a6c2 100644
--- a/glance/common/config.py
+++ b/glance/common/config.py
@@ -25,8 +25,8 @@ import logging.handlers
 import os
 import tempfile
 
-from oslo.config import cfg
 from oslo_concurrency import lockutils
+from oslo_config import cfg
 from paste import deploy
 
 from glance import i18n
diff --git a/glance/common/location_strategy/__init__.py b/glance/common/location_strategy/__init__.py
index d297950df6..74afe9113d 100644
--- a/glance/common/location_strategy/__init__.py
+++ b/glance/common/location_strategy/__init__.py
@@ -15,7 +15,7 @@
 
 import copy
 
-from oslo.config import cfg
+from oslo_config import cfg
 import stevedore
 
 from glance import i18n
diff --git a/glance/common/location_strategy/store_type.py b/glance/common/location_strategy/store_type.py
index 75f8c23967..6719ea60eb 100644
--- a/glance/common/location_strategy/store_type.py
+++ b/glance/common/location_strategy/store_type.py
@@ -15,7 +15,7 @@
 
 """Storage preference based location strategy module"""
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 import six.moves.urllib.parse as urlparse
 
diff --git a/glance/common/property_utils.py b/glance/common/property_utils.py
index 4633043083..8967c6b8fc 100644
--- a/glance/common/property_utils.py
+++ b/glance/common/property_utils.py
@@ -19,7 +19,7 @@ try:
 except ImportError:
     from ordereddict import OrderedDict
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 import glance.api.policy
 from glance.common import exception
diff --git a/glance/common/rpc.py b/glance/common/rpc.py
index b3ab8c84d4..1eea5705f4 100644
--- a/glance/common/rpc.py
+++ b/glance/common/rpc.py
@@ -19,7 +19,7 @@ RPC Controller
 import datetime
 import traceback
 
-from oslo.config import cfg
+from oslo_config import cfg
 import oslo_utils.importutils as imp
 from oslo_utils import timeutils
 import six
diff --git a/glance/common/store_utils.py b/glance/common/store_utils.py
index 679057e9f0..7aac506f4c 100644
--- a/glance/common/store_utils.py
+++ b/glance/common/store_utils.py
@@ -15,7 +15,7 @@
 import sys
 
 import glance_store as store_api
-from oslo.config import cfg
+from oslo_config import cfg
 import six.moves.urllib.parse as urlparse
 
 from glance.common import utils
diff --git a/glance/common/swift_store_utils.py b/glance/common/swift_store_utils.py
index a6bc51f5de..d46e754124 100644
--- a/glance/common/swift_store_utils.py
+++ b/glance/common/swift_store_utils.py
@@ -18,7 +18,7 @@ try:
 except ImportError:
     from ordereddict import OrderedDict
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from glance.common import exception
 from glance import i18n
diff --git a/glance/common/utils.py b/glance/common/utils.py
index 9e8ced280b..2e98b08246 100644
--- a/glance/common/utils.py
+++ b/glance/common/utils.py
@@ -37,7 +37,7 @@ import uuid
 
 import netaddr
 from OpenSSL import crypto
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import encodeutils
 from oslo_utils import excutils
 from oslo_utils import netutils
diff --git a/glance/common/wsgi.py b/glance/common/wsgi.py
index 5304144b3f..05307ab641 100644
--- a/glance/common/wsgi.py
+++ b/glance/common/wsgi.py
@@ -34,9 +34,9 @@ from eventlet.green import socket
 from eventlet.green import ssl
 import eventlet.greenio
 import eventlet.wsgi
-from oslo.config import cfg
 from oslo.serialization import jsonutils
 from oslo_concurrency import processutils
+from oslo_config import cfg
 import routes
 import routes.middleware
 import six
diff --git a/glance/db/__init__.py b/glance/db/__init__.py
index 5716650c23..fe44acfea8 100644
--- a/glance/db/__init__.py
+++ b/glance/db/__init__.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 oslo_utils import importutils
 from wsme.rest import json
 
diff --git a/glance/db/metadata.py b/glance/db/metadata.py
index 7d288a1d8b..8af3164cae 100644
--- a/glance/db/metadata.py
+++ b/glance/db/metadata.py
@@ -21,8 +21,8 @@
 
 import threading
 
-from oslo.config import cfg
 from oslo.db import options as db_options
+from oslo_config import cfg
 from stevedore import driver
 
 from glance.db.sqlalchemy import api as db_api
diff --git a/glance/db/migration.py b/glance/db/migration.py
index 3e50d93970..f3b09c6aee 100644
--- a/glance/db/migration.py
+++ b/glance/db/migration.py
@@ -22,8 +22,8 @@
 import os
 import threading
 
-from oslo.config import cfg
 from oslo.db import options as db_options
+from oslo_config import cfg
 from stevedore import driver
 
 from glance.db.sqlalchemy import api as db_api
diff --git a/glance/db/sqlalchemy/api.py b/glance/db/sqlalchemy/api.py
index 4e3ffa619c..69cce04b66 100644
--- a/glance/db/sqlalchemy/api.py
+++ b/glance/db/sqlalchemy/api.py
@@ -22,9 +22,9 @@
 
 import threading
 
-from oslo.config import cfg
 from oslo.db import exception as db_exception
 from oslo.db.sqlalchemy import session
+from oslo_config import cfg
 from oslo_utils import timeutils
 import osprofiler.sqlalchemy
 from retrying import retry
diff --git a/glance/db/sqlalchemy/metadata.py b/glance/db/sqlalchemy/metadata.py
index defdc24dab..ed1fa35fea 100644
--- a/glance/db/sqlalchemy/metadata.py
+++ b/glance/db/sqlalchemy/metadata.py
@@ -23,7 +23,7 @@ from os.path import isfile
 from os.path import join
 import re
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import timeutils
 import six
 import sqlalchemy
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py b/glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py
index de650e7482..31c5896fab 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py
@@ -30,7 +30,7 @@ import types  # noqa
 
 # NOTE(flaper87): This is bad but there ain't better way to do it.
 from glance_store._drivers import swift  # noqa
-from oslo.config import cfg
+from oslo_config import cfg
 import six.moves.urllib.parse as urlparse
 import sqlalchemy
 
diff --git a/glance/domain/__init__.py b/glance/domain/__init__.py
index 876140f36b..633e1baa68 100644
--- a/glance/domain/__init__.py
+++ b/glance/domain/__init__.py
@@ -18,7 +18,7 @@ import collections
 import datetime
 import uuid
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import excutils
 from oslo_utils import importutils
 from oslo_utils import timeutils
diff --git a/glance/image_cache/__init__.py b/glance/image_cache/__init__.py
index 6d8d006e94..6b83750da8 100644
--- a/glance/image_cache/__init__.py
+++ b/glance/image_cache/__init__.py
@@ -19,7 +19,7 @@ LRU Cache for Image Data
 
 import hashlib
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import excutils
 from oslo_utils import importutils
 from oslo_utils import units
diff --git a/glance/image_cache/drivers/base.py b/glance/image_cache/drivers/base.py
index 48db04ea0d..022e11b707 100644
--- a/glance/image_cache/drivers/base.py
+++ b/glance/image_cache/drivers/base.py
@@ -19,7 +19,7 @@ Base attribute driver class
 
 import os.path
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from glance.common import exception
 from glance.common import utils
diff --git a/glance/image_cache/drivers/sqlite.py b/glance/image_cache/drivers/sqlite.py
index f80894f497..aed91b0622 100644
--- a/glance/image_cache/drivers/sqlite.py
+++ b/glance/image_cache/drivers/sqlite.py
@@ -26,7 +26,7 @@ import time
 
 from eventlet import sleep
 from eventlet import timeout
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import excutils
 
 from glance.common import exception
diff --git a/glance/image_cache/drivers/xattr.py b/glance/image_cache/drivers/xattr.py
index 26576ee9ed..82855107db 100644
--- a/glance/image_cache/drivers/xattr.py
+++ b/glance/image_cache/drivers/xattr.py
@@ -58,7 +58,7 @@ import os
 import stat
 import time
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import excutils
 import xattr
 
diff --git a/glance/location.py b/glance/location.py
index b9a7053390..a18987f498 100644
--- a/glance/location.py
+++ b/glance/location.py
@@ -17,7 +17,7 @@ import collections
 import copy
 
 import glance_store as store
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import excutils
 
 from glance.common import exception
diff --git a/glance/notifier.py b/glance/notifier.py
index 74b134d244..a10f3b98b9 100644
--- a/glance/notifier.py
+++ b/glance/notifier.py
@@ -15,8 +15,8 @@
 #    under the License.
 
 import glance_store
-from oslo.config import cfg
 from oslo import messaging
+from oslo_config import cfg
 from oslo_utils import excutils
 from oslo_utils import timeutils
 import webob
diff --git a/glance/openstack/common/log.py b/glance/openstack/common/log.py
index 1ade396228..920226a358 100644
--- a/glance/openstack/common/log.py
+++ b/glance/openstack/common/log.py
@@ -37,7 +37,7 @@ import socket
 import sys
 import traceback
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo.serialization import jsonutils
 from oslo_utils import importutils
 import six
diff --git a/glance/openstack/common/policy.py b/glance/openstack/common/policy.py
index b38e3d9f45..4fc85c5cdd 100644
--- a/glance/openstack/common/policy.py
+++ b/glance/openstack/common/policy.py
@@ -81,7 +81,7 @@ import copy
 import os
 import re
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo.serialization import jsonutils
 import six
 import six.moves.urllib.parse as urlparse
diff --git a/glance/opts.py b/glance/opts.py
index dc9805d3ed..072d5ac624 100644
--- a/glance/opts.py
+++ b/glance/opts.py
@@ -108,7 +108,7 @@ _manage_opts = [
 
 
 def list_api_opts():
-    """Return a list of oslo.config options available in Glance API service.
+    """Return a list of oslo_config options available in Glance API service.
 
     Each element of the list is a tuple. The first element is the name of the
     group under which the list of elements in the second element will be
@@ -116,7 +116,7 @@ def list_api_opts():
     config files.
 
     This function is also discoverable via the 'glance.api' entry point
-    under the 'oslo.config.opts' namespace.
+    under the 'oslo_config.opts' namespace.
 
     The purpose of this is to allow tools like the Oslo sample config file
     generator to discover the options exposed to users by Glance.
@@ -128,26 +128,26 @@ def list_api_opts():
 
 
 def list_registry_opts():
-    """Return a list of oslo.config options available in Glance Registry
+    """Return a list of oslo_config options available in Glance Registry
     service.
     """
     return [(g, copy.deepcopy(o)) for g, o in _registry_opts]
 
 
 def list_scrubber_opts():
-    """Return a list of oslo.config options available in Glance Scrubber
+    """Return a list of oslo_config options available in Glance Scrubber
     service.
     """
     return [(g, copy.deepcopy(o)) for g, o in _scrubber_opts]
 
 
 def list_cache_opts():
-    """Return a list of oslo.config options available in Glance Cache
+    """Return a list of oslo_config options available in Glance Cache
     service.
     """
     return [(g, copy.deepcopy(o)) for g, o in _cache_opts]
 
 
 def list_manage_opts():
-    """Return a list of oslo.config options available in Glance manage."""
+    """Return a list of oslo_config options available in Glance manage."""
     return [(g, copy.deepcopy(o)) for g, o in _manage_opts]
diff --git a/glance/quota/__init__.py b/glance/quota/__init__.py
index fbcb280be3..81b4daee84 100644
--- a/glance/quota/__init__.py
+++ b/glance/quota/__init__.py
@@ -15,7 +15,7 @@
 import copy
 
 import glance_store as store
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import excutils
 import six
 
diff --git a/glance/registry/__init__.py b/glance/registry/__init__.py
index a269c17c82..9322845299 100644
--- a/glance/registry/__init__.py
+++ b/glance/registry/__init__.py
@@ -17,7 +17,7 @@
 Registry API
 """
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from glance import i18n
 
diff --git a/glance/registry/api/__init__.py b/glance/registry/api/__init__.py
index 4ca8e5dfcf..1237498599 100644
--- a/glance/registry/api/__init__.py
+++ b/glance/registry/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
 
 from glance.common import wsgi
 from glance.registry.api import v1
diff --git a/glance/registry/api/v1/images.py b/glance/registry/api/v1/images.py
index 8d8872729e..f6e89bc4bc 100644
--- a/glance/registry/api/v1/images.py
+++ b/glance/registry/api/v1/images.py
@@ -17,7 +17,7 @@
 Reference implementation registry server WSGI controller
 """
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import strutils
 from oslo_utils import timeutils
 from webob import exc
diff --git a/glance/registry/api/v2/rpc.py b/glance/registry/api/v2/rpc.py
index 7e59a37530..e08e8e198f 100644
--- a/glance/registry/api/v2/rpc.py
+++ b/glance/registry/api/v2/rpc.py
@@ -17,7 +17,7 @@
 RPC Controller
 """
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from glance.common import rpc
 from glance.common import wsgi
diff --git a/glance/registry/client/__init__.py b/glance/registry/client/__init__.py
index 8528c0ad3a..f4ebdbbd93 100644
--- a/glance/registry/client/__init__.py
+++ b/glance/registry/client/__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
 
 from glance import i18n
 
diff --git a/glance/registry/client/v1/api.py b/glance/registry/client/v1/api.py
index 347c970dc1..52ce76fd8a 100644
--- a/glance/registry/client/v1/api.py
+++ b/glance/registry/client/v1/api.py
@@ -19,8 +19,8 @@ Registry's Client API
 
 import os
 
-from oslo.config import cfg
 from oslo.serialization import jsonutils
+from oslo_config import cfg
 
 from glance.common import exception
 from glance import i18n
diff --git a/glance/registry/client/v2/api.py b/glance/registry/client/v2/api.py
index 69b136af7a..56d922b13f 100644
--- a/glance/registry/client/v2/api.py
+++ b/glance/registry/client/v2/api.py
@@ -19,7 +19,7 @@ Registry's Client V2
 
 import os
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from glance.common import exception
 from glance import i18n
diff --git a/glance/scrubber.py b/glance/scrubber.py
index 2fda6f7129..4d16018a09 100644
--- a/glance/scrubber.py
+++ b/glance/scrubber.py
@@ -19,8 +19,8 @@ import os
 import time
 
 import eventlet
-from oslo.config import cfg
 from oslo_concurrency import lockutils
+from oslo_config import cfg
 import six
 
 from glance.common import crypt
diff --git a/glance/tests/functional/db/test_registry.py b/glance/tests/functional/db/test_registry.py
index 37fe06f99c..7b23f73b81 100644
--- a/glance/tests/functional/db/test_registry.py
+++ b/glance/tests/functional/db/test_registry.py
@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
 from oslo.db import options
+from oslo_config import cfg
 
 import glance.db
 import glance.tests.functional.db as db_tests
diff --git a/glance/tests/functional/db/test_sqlalchemy.py b/glance/tests/functional/db/test_sqlalchemy.py
index c38b01d304..be48d0006b 100644
--- a/glance/tests/functional/db/test_sqlalchemy.py
+++ b/glance/tests/functional/db/test_sqlalchemy.py
@@ -14,8 +14,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
 from oslo.db import options
+from oslo_config import cfg
 
 from glance.common import exception
 import glance.db.sqlalchemy.api
diff --git a/glance/tests/integration/legacy_functional/base.py b/glance/tests/integration/legacy_functional/base.py
index 37171c0a6d..3b9fbefa88 100644
--- a/glance/tests/integration/legacy_functional/base.py
+++ b/glance/tests/integration/legacy_functional/base.py
@@ -16,8 +16,8 @@ import tempfile
 
 import fixtures
 import glance_store
-from oslo.config import cfg
 from oslo.db import options
+from oslo_config import cfg
 
 import glance.common.client
 from glance.common import config
diff --git a/glance/tests/integration/v2/base.py b/glance/tests/integration/v2/base.py
index 50d7f585c1..c0776fc170 100644
--- a/glance/tests/integration/v2/base.py
+++ b/glance/tests/integration/v2/base.py
@@ -19,8 +19,8 @@ import tempfile
 
 import fixtures
 import glance_store
-from oslo.config import cfg
 from oslo.db import options
+from oslo_config import cfg
 
 import glance.common.client
 from glance.common import config
diff --git a/glance/tests/integration/v2/test_property_quota_violations.py b/glance/tests/integration/v2/test_property_quota_violations.py
index 2cf61dfb33..38022f0af8 100644
--- a/glance/tests/integration/v2/test_property_quota_violations.py
+++ b/glance/tests/integration/v2/test_property_quota_violations.py
@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
 from oslo.serialization import jsonutils
+from oslo_config import cfg
 
 from glance.tests.integration.v2 import base
 
diff --git a/glance/tests/unit/api/test_cmd.py b/glance/tests/unit/api/test_cmd.py
index f552f95420..d998d99ac9 100644
--- a/glance/tests/unit/api/test_cmd.py
+++ b/glance/tests/unit/api/test_cmd.py
@@ -13,7 +13,7 @@ import sys
 
 import glance_store as store
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 import glance.cmd.api
diff --git a/glance/tests/unit/base.py b/glance/tests/unit/base.py
index 2123c4edeb..1cd51f5f9d 100644
--- a/glance/tests/unit/base.py
+++ b/glance/tests/unit/base.py
@@ -17,10 +17,10 @@ import os
 
 import glance_store as store
 from glance_store import location
-from oslo.config import cfg
 from oslo.db import options
 from oslo.serialization import jsonutils
 from oslo_concurrency import lockutils
+from oslo_config import cfg
 
 from glance.openstack.common import local
 from glance.tests import stubs
diff --git a/glance/tests/unit/common/test_rpc.py b/glance/tests/unit/common/test_rpc.py
index 9fcc20ed0e..8f5e8e1efb 100644
--- a/glance/tests/unit/common/test_rpc.py
+++ b/glance/tests/unit/common/test_rpc.py
@@ -16,8 +16,8 @@
 #    under the License.
 import datetime
 
-from oslo.config import cfg
 from oslo.serialization import jsonutils
+from oslo_config import cfg
 import routes
 import webob
 
diff --git a/glance/tests/unit/test_db.py b/glance/tests/unit/test_db.py
index 9237de9838..70aee54f29 100644
--- a/glance/tests/unit/test_db.py
+++ b/glance/tests/unit/test_db.py
@@ -17,8 +17,8 @@
 import uuid
 
 import mock
-from oslo.config import cfg
 from oslo.db import exception as db_exc
+from oslo_config import cfg
 
 from glance.common import crypt
 from glance.common import exception
diff --git a/glance/tests/unit/test_domain.py b/glance/tests/unit/test_domain.py
index 093cd6a905..39ea62a00f 100644
--- a/glance/tests/unit/test_domain.py
+++ b/glance/tests/unit/test_domain.py
@@ -18,7 +18,7 @@ import datetime
 import uuid
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 import oslo_utils.importutils
 from oslo_utils import timeutils
 
diff --git a/glance/tests/unit/test_migrations.py b/glance/tests/unit/test_migrations.py
index 92b75727c7..4d5d98efd5 100644
--- a/glance/tests/unit/test_migrations.py
+++ b/glance/tests/unit/test_migrations.py
@@ -33,11 +33,11 @@ import uuid
 
 from migrate.versioning import api as migration_api
 from migrate.versioning.repository import Repository
-from oslo.config import cfg
 from oslo.db.sqlalchemy import test_base
 from oslo.db.sqlalchemy import test_migrations
 from oslo.db.sqlalchemy import utils as db_utils
 from oslo.serialization import jsonutils
+from oslo_config import cfg
 from oslo_utils import timeutils
 import sqlalchemy
 
diff --git a/glance/tests/unit/test_notifier.py b/glance/tests/unit/test_notifier.py
index 31ffc13de5..fc5b62697c 100644
--- a/glance/tests/unit/test_notifier.py
+++ b/glance/tests/unit/test_notifier.py
@@ -18,8 +18,8 @@ import datetime
 
 import glance_store
 import mock
-from oslo.config import cfg
 from oslo import messaging
+from oslo_config import cfg
 from oslo_utils import timeutils
 import webob
 
diff --git a/glance/tests/unit/test_policy.py b/glance/tests/unit/test_policy.py
index e0bdcddcdd..db8f4d774d 100644
--- a/glance/tests/unit/test_policy.py
+++ b/glance/tests/unit/test_policy.py
@@ -17,7 +17,7 @@
 import os.path
 
 import mock
-import oslo.config.cfg
+import oslo_config.cfg
 
 import glance.api.policy
 from glance.common import exception
@@ -178,7 +178,7 @@ class TestPolicyEnforcerNoFile(base.IsolatedUnitTest):
         def fake_find_file(self, name):
             return None
 
-        self.stubs.Set(oslo.config.cfg.ConfigOpts, 'find_file',
+        self.stubs.Set(oslo_config.cfg.ConfigOpts, 'find_file',
                        fake_find_file)
 
         enforcer = glance.api.policy.Enforcer()
diff --git a/glance/tests/unit/test_scrubber.py b/glance/tests/unit/test_scrubber.py
index b65aadec9a..4364af299b 100644
--- a/glance/tests/unit/test_scrubber.py
+++ b/glance/tests/unit/test_scrubber.py
@@ -22,7 +22,7 @@ import eventlet
 import glance_store
 from mock import patch
 import mox
-from oslo.config import cfg
+from oslo_config import cfg
 
 from glance.common import exception
 from glance import scrubber
diff --git a/glance/tests/unit/utils.py b/glance/tests/unit/utils.py
index ebe2dfc0e1..36ff2d87dc 100644
--- a/glance/tests/unit/utils.py
+++ b/glance/tests/unit/utils.py
@@ -16,7 +16,7 @@
 import urllib
 
 import glance_store as store
-from oslo.config import cfg
+from oslo_config import cfg
 import six.moves.urllib.parse as urlparse
 
 from glance.common import exception
diff --git a/glance/tests/unit/v1/test_api.py b/glance/tests/unit/v1/test_api.py
index 03a262876f..cde993c706 100644
--- a/glance/tests/unit/v1/test_api.py
+++ b/glance/tests/unit/v1/test_api.py
@@ -23,8 +23,8 @@ import uuid
 
 import glance_store as store
 import mock
-from oslo.config import cfg
 from oslo.serialization import jsonutils
+from oslo_config import cfg
 from oslo_utils import timeutils
 import routes
 import six
diff --git a/glance/tests/unit/v1/test_registry_api.py b/glance/tests/unit/v1/test_registry_api.py
index 113fcaf703..906f13b1cd 100644
--- a/glance/tests/unit/v1/test_registry_api.py
+++ b/glance/tests/unit/v1/test_registry_api.py
@@ -19,8 +19,8 @@ import datetime
 import uuid
 
 import mock
-from oslo.config import cfg
 from oslo.serialization import jsonutils
+from oslo_config import cfg
 from oslo_utils import timeutils
 import routes
 import six
diff --git a/glance/tests/unit/v2/test_image_members_resource.py b/glance/tests/unit/v2/test_image_members_resource.py
index b8295abb2f..97238a4510 100644
--- a/glance/tests/unit/v2/test_image_members_resource.py
+++ b/glance/tests/unit/v2/test_image_members_resource.py
@@ -16,8 +16,8 @@
 import datetime
 
 import glance_store
-from oslo.config import cfg
 from oslo.serialization import jsonutils
+from oslo_config import cfg
 import webob
 
 import glance.api.v2.image_members
diff --git a/glance/tests/unit/v2/test_images_resource.py b/glance/tests/unit/v2/test_images_resource.py
index 8c03ec9cf5..553eb6af94 100644
--- a/glance/tests/unit/v2/test_images_resource.py
+++ b/glance/tests/unit/v2/test_images_resource.py
@@ -19,8 +19,8 @@ import uuid
 
 import glance_store as store
 import mock
-from oslo.config import cfg
 from oslo.serialization import jsonutils
+from oslo_config import cfg
 import six
 import testtools
 import webob
diff --git a/glance/tests/unit/v2/test_registry_api.py b/glance/tests/unit/v2/test_registry_api.py
index 016ecabea3..da8a63e2fe 100644
--- a/glance/tests/unit/v2/test_registry_api.py
+++ b/glance/tests/unit/v2/test_registry_api.py
@@ -18,8 +18,8 @@
 import datetime
 import uuid
 
-from oslo.config import cfg
 from oslo.serialization import jsonutils
+from oslo_config import cfg
 from oslo_utils import timeutils
 import routes
 import six
diff --git a/glance/tests/utils.py b/glance/tests/utils.py
index c5d9d8ad83..092fffb5d0 100644
--- a/glance/tests/utils.py
+++ b/glance/tests/utils.py
@@ -24,8 +24,8 @@ import socket
 import subprocess
 
 import fixtures
-from oslo.config import cfg
 from oslo.serialization import jsonutils
+from oslo_config import cfg
 from oslo_utils import timeutils
 import six
 import stubout
diff --git a/tools/migrate_image_owners.py b/tools/migrate_image_owners.py
index 90661b7ad7..80df06ccf5 100644
--- a/tools/migrate_image_owners.py
+++ b/tools/migrate_image_owners.py
@@ -16,7 +16,7 @@
 import sys
 
 import keystoneclient.v2_0.client
-from oslo.config import cfg
+from oslo_config import cfg
 
 import glance.context
 import glance.db.sqlalchemy.api as db_api