diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-02-05 04:00:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-02-05 04:00:29 +0000 |
| commit | b4f1db88683f5bb9ff0af7159e34c3117aa0beff (patch) | |
| tree | 99aa54b8e0930fd404c1967032f24194afca8a4d /ironic/common/keystone.py | |
| parent | 5a5b72718bd7b690d75bd561fb496b25dbc7a535 (diff) | |
| parent | 80aba0c9d403655a5b458c16d4d2141f4291afd7 (diff) | |
| download | ironic-b4f1db88683f5bb9ff0af7159e34c3117aa0beff.tar.gz | |
Merge "Move oslo.config references to oslo_config"
Diffstat (limited to 'ironic/common/keystone.py')
| -rw-r--r-- | ironic/common/keystone.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ironic/common/keystone.py b/ironic/common/keystone.py index 47710c2a4..48144d94c 100644 --- a/ironic/common/keystone.py +++ b/ironic/common/keystone.py @@ -13,9 +13,9 @@ # under the License. from keystoneclient import exceptions as ksexception -# NOTE(deva): import auth_token so oslo.config pulls in keystone_authtoken +# NOTE(deva): import auth_token so oslo_config pulls in keystone_authtoken from keystonemiddleware import auth_token # noqa -from oslo.config import cfg +from oslo_config import cfg from six.moves.urllib import parse from ironic.common import exception |