Move from oslo.config to oslo_config

oslo_config was moved out of the oslo namespace in oslo.config>=1.6.0.

Related-to: blueprint drop-namespace-packages

Change-Id: I30ecbf8f9de77496fcb643c7ad9738d79ad359f0

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

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
 

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

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

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

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

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

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
 

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

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

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

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

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

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

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

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
 

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
 

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

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
 

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

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

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

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
 

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

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

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

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

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

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

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
 

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

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

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

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

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
 

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

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

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

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

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
 

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

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

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

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

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]

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
 

glance/registry/__init__.py

@@ -17,7 +17,7 @@
 Registry API
 """
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from glance import i18n
 

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

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

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

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
 

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

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

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

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

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

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

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

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
 

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

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

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
 

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

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
 

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
 

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
 

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()

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

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

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

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

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

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

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

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

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