Change oslo.config to oslo_config

The oslo.config libraries are moving away from oslo-namespaced
packages.

Note that his requires oslo.config>=1.6.0

bp drop-namespace-packages

Change-Id: Ic0d4053875da0628f2359c109f2779d12aadc3eb

12 files changed, 16 insertions, 15 deletions

diff --git a/openstack/common/cache/cache.py b/openstack/common/cache/cache.py
index 68582fc9..2b463bac 100644
--- a/openstack/common/cache/cache.py
+++ b/openstack/common/cache/cache.py
@@ -45,7 +45,7 @@ def _get_oslo_configs():
     # at the top of this file, lets import cfg
     # here and assume that the caller of this
     # function already took care of this dependency.
-    from oslo.config import cfg
+    from oslo_config import cfg
 
     return [
         cfg.StrOpt('cache_url', default='memory://',
diff --git a/openstack/common/eventlet_backdoor.py b/openstack/common/eventlet_backdoor.py
index 091cc772..0ea3ffa1 100644
--- a/openstack/common/eventlet_backdoor.py
+++ b/openstack/common/eventlet_backdoor.py
@@ -28,7 +28,7 @@ import traceback
 
 import eventlet.backdoor
 import greenlet
-from oslo.config import cfg
+from oslo_config import cfg
 
 from openstack.common._i18n import _LI
 
diff --git a/openstack/common/memorycache.py b/openstack/common/memorycache.py
index a6036647..91e107fa 100644
--- a/openstack/common/memorycache.py
+++ b/openstack/common/memorycache.py
@@ -18,8 +18,8 @@
 
 import copy
 
-from oslo.config import cfg
 from oslo.utils import timeutils
+from oslo_config import cfg
 
 memcache_opts = [
     cfg.ListOpt('memcached_servers',
diff --git a/openstack/common/periodic_task.py b/openstack/common/periodic_task.py
index 34a16383..b7c7cd7c 100644
--- a/openstack/common/periodic_task.py
+++ b/openstack/common/periodic_task.py
@@ -16,7 +16,7 @@ import logging
 import random
 import time
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from openstack.common._i18n import _, _LE, _LI
diff --git a/openstack/common/policy.py b/openstack/common/policy.py
index a33edfed..10ccb649 100644
--- a/openstack/common/policy.py
+++ b/openstack/common/policy.py
@@ -95,7 +95,7 @@ import logging
 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/openstack/common/quota.py b/openstack/common/quota.py
index d4404662..5634f094 100644
--- a/openstack/common/quota.py
+++ b/openstack/common/quota.py
@@ -20,9 +20,9 @@ import copy
 import datetime
 import logging
 
-from oslo.config import cfg
 from oslo.utils import importutils
 from oslo.utils import timeutils
+from oslo_config import cfg
 import six
 
 from openstack.common._i18n import _, _LE
diff --git a/openstack/common/report/generators/conf.py b/openstack/common/report/generators/conf.py
index dead9f39..619e4898 100644
--- a/openstack/common/report/generators/conf.py
+++ b/openstack/common/report/generators/conf.py
@@ -19,7 +19,7 @@ generators for generating the model in
 :mod:`openstack.common.report.models.conf`.
 """
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from openstack.common.report.models import conf as cm
 
@@ -30,11 +30,11 @@ class ConfigReportGenerator(object):
     This generator returns
     :class:`openstack.common.report.models.conf.ConfigModel`,
     by default using the configuration options stored
-    in :attr:`oslo.config.cfg.CONF`, which is where
+    in :attr:`oslo_config.cfg.CONF`, which is where
     OpenStack stores everything.
 
     :param cnf: the configuration option object
-    :type cnf: :class:`oslo.config.cfg.ConfigOpts`
+    :type cnf: :class:`oslo_config.cfg.ConfigOpts`
     """
 
     def __init__(self, cnf=cfg.CONF):
diff --git a/openstack/common/report/models/conf.py b/openstack/common/report/models/conf.py
index 3c5ac501..23429373 100644
--- a/openstack/common/report/models/conf.py
+++ b/openstack/common/report/models/conf.py
@@ -15,7 +15,7 @@
 """Provides OpenStack Configuration Model
 
 This module defines a class representing the data
-model for :mod:`oslo.config` configuration options
+model for :mod:`oslo_config` configuration options
 """
 
 from openstack.common.report.models import with_default_views as mwdv
@@ -26,11 +26,11 @@ class ConfigModel(mwdv.ModelWithDefaultViews):
     """A Configuration Options Model
 
     This model holds data about a set of configuration options
-    from :mod:`oslo.config`.  It supports both the default group
+    from :mod:`oslo_config`.  It supports both the default group
     of options and named option groups.
 
     :param conf_obj: a configuration object
-    :type conf_obj: :class:`oslo.config.cfg.ConfigOpts`
+    :type conf_obj: :class:`oslo_config.cfg.ConfigOpts`
     """
 
     def __init__(self, conf_obj):
diff --git a/openstack/common/service.py b/openstack/common/service.py
index c8d2d254..1e99487d 100644
--- a/openstack/common/service.py
+++ b/openstack/common/service.py
@@ -35,7 +35,7 @@ except ImportError:
 
 import eventlet
 from eventlet import event
-from oslo.config import cfg
+from oslo_config import cfg
 
 from openstack.common import eventlet_backdoor
 from openstack.common._i18n import _LE, _LI, _LW
diff --git a/openstack/common/sslutils.py b/openstack/common/sslutils.py
index 4e294e71..7b556683 100644
--- a/openstack/common/sslutils.py
+++ b/openstack/common/sslutils.py
@@ -16,7 +16,7 @@ import copy
 import os
 import ssl
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from openstack.common._i18n import _
 
diff --git a/tools/find_used_deleted_modules.py b/tools/find_used_deleted_modules.py
index 8c98c720..724d2bde 100755
--- a/tools/find_used_deleted_modules.py
+++ b/tools/find_used_deleted_modules.py
@@ -23,7 +23,7 @@ import glob
 import os
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 # Extend sys.path to find update.py
 my_dir = os.path.dirname(__file__)
diff --git a/tools/list_oslo_projects.py b/tools/list_oslo_projects.py
index 9f55810f..0a0293e8 100755
--- a/tools/list_oslo_projects.py
+++ b/tools/list_oslo_projects.py
@@ -20,6 +20,7 @@ from __future__ import print_function
 import os
 
 import oslo_tool_config as cfg
+
 import yaml