Merge "Switch from oslo.config to oslo_config"

keystonemiddleware/audit.py

@@ -24,7 +24,7 @@ import logging
 import os.path
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 try:
     import oslo.messaging
     messaging = True

keystonemiddleware/auth_token.py

@@ -188,7 +188,7 @@ from keystoneclient.common import cms
 from keystoneclient import discover
 from keystoneclient import exceptions
 from keystoneclient import session
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_serialization import jsonutils
 from oslo_utils import timeutils
 import six

keystonemiddleware/ec2_token.py

@@ -20,7 +20,7 @@ Starting point for routing EC2 requests.
 
 """
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_serialization import jsonutils
 import requests
 import webob.dec

keystonemiddleware/opts.py

@@ -29,9 +29,9 @@ auth_token_opts = [
 
 
 def list_auth_token_opts():
-    """Return a list of oslo.config options available in auth_token middleware.
+    """Return a list of oslo_config options available in auth_token middleware.
 
-    The returned list includes all oslo.config options which may be registered
+    The returned list includes all oslo_config options which may be registered
     at runtime by the project.
 
     Each element of the list is a tuple. The first element is the name of the

keystonemiddleware/tests/test_audit_middleware.py

@@ -15,7 +15,7 @@ import os
 import tempfile
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 import testtools
 from testtools import matchers
 import webob

keystonemiddleware/tests/test_auth_token_middleware.py

@@ -31,7 +31,7 @@ from keystoneclient import exceptions
 from keystoneclient import fixture
 from keystoneclient import session
 import mock
-from oslo.config import fixture as cfg_fixture
+from oslo_config import fixture as cfg_fixture
 from oslo_serialization import jsonutils
 from oslo_utils import timeutils
 from requests_mock.contrib import fixture as rm_fixture