diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-02-07 08:10:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-02-07 08:10:18 +0000 |
| commit | 07d25c3b4a0bf837cbbce6f09a274cdd75896839 (patch) | |
| tree | ca448154ffb7817b01e5679f3f991624e6d7a447 | |
| parent | 77f6fba43388c2daf43ed7ac71df84c51fafee82 (diff) | |
| parent | 3e1bee7100d4214c6745a286601d338137a1cb3b (diff) | |
| download | keystonemiddleware-07d25c3b4a0bf837cbbce6f09a274cdd75896839.tar.gz | |
Merge "Switch from oslo.config to oslo_config"
| -rw-r--r-- | keystonemiddleware/audit.py | 2 | ||||
| -rw-r--r-- | keystonemiddleware/auth_token.py | 2 | ||||
| -rw-r--r-- | keystonemiddleware/ec2_token.py | 2 | ||||
| -rw-r--r-- | keystonemiddleware/opts.py | 4 | ||||
| -rw-r--r-- | keystonemiddleware/tests/test_audit_middleware.py | 2 | ||||
| -rw-r--r-- | keystonemiddleware/tests/test_auth_token_middleware.py | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/keystonemiddleware/audit.py b/keystonemiddleware/audit.py index 06571ed..1c3b602 100644 --- a/keystonemiddleware/audit.py +++ b/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 diff --git a/keystonemiddleware/auth_token.py b/keystonemiddleware/auth_token.py index 9d5e9dd..d2b6be3 100644 --- a/keystonemiddleware/auth_token.py +++ b/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 diff --git a/keystonemiddleware/ec2_token.py b/keystonemiddleware/ec2_token.py index 11db7d5..df3bb6b 100644 --- a/keystonemiddleware/ec2_token.py +++ b/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 diff --git a/keystonemiddleware/opts.py b/keystonemiddleware/opts.py index 33be3db..7dd1e53 100644 --- a/keystonemiddleware/opts.py +++ b/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 diff --git a/keystonemiddleware/tests/test_audit_middleware.py b/keystonemiddleware/tests/test_audit_middleware.py index b7dca28..4726176 100644 --- a/keystonemiddleware/tests/test_audit_middleware.py +++ b/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 diff --git a/keystonemiddleware/tests/test_auth_token_middleware.py b/keystonemiddleware/tests/test_auth_token_middleware.py index e007e98..7811f0d 100644 --- a/keystonemiddleware/tests/test_auth_token_middleware.py +++ b/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 |