diff options
| author | Davanum Srinivas <davanum@gmail.com> | 2015-02-09 17:28:19 -0500 |
|---|---|---|
| committer | Davanum Srinivas <davanum@gmail.com> | 2015-02-22 07:56:40 -0500 |
| commit | 97d63d8745cd9b3b391ce96b94b4da263b3a053d (patch) | |
| tree | d5263049b6672424f7ad5ec7e8aa364609022b40 /nova/keymgr | |
| parent | 69d0c643610dadca24fd146b6fdcfd82362fb431 (diff) | |
| download | nova-97d63d8745cd9b3b391ce96b94b4da263b3a053d.tar.gz | |
Use oslo.log
Convert the use of the incubated version of the log module
to the new oslo.log library.
Sync oslo-incubator modules to update their imports as well.
Co-Authored-By: Doug Hellmann <doug@doughellmann.com>
Change-Id: Ic4932e3f58191869c30bd07a010a6e9fdcb2a12c
Diffstat (limited to 'nova/keymgr')
| -rw-r--r-- | nova/keymgr/barbican.py | 2 | ||||
| -rw-r--r-- | nova/keymgr/mock_key_mgr.py | 3 | ||||
| -rw-r--r-- | nova/keymgr/single_key_mgr.py | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/nova/keymgr/barbican.py b/nova/keymgr/barbican.py index 1c69d69d70..9f68b1b536 100644 --- a/nova/keymgr/barbican.py +++ b/nova/keymgr/barbican.py @@ -24,6 +24,7 @@ import binascii from barbicanclient import client as barbican_client from keystoneclient import session from oslo_config import cfg +from oslo_log import log as logging from oslo_utils import excutils from nova import exception @@ -31,7 +32,6 @@ from nova.i18n import _ from nova.i18n import _LE from nova.keymgr import key as keymgr_key from nova.keymgr import key_mgr -from nova.openstack.common import log as logging barbican_opts = [ cfg.StrOpt('catalog_info', diff --git a/nova/keymgr/mock_key_mgr.py b/nova/keymgr/mock_key_mgr.py index 96b4872e8a..82fe6494f3 100644 --- a/nova/keymgr/mock_key_mgr.py +++ b/nova/keymgr/mock_key_mgr.py @@ -28,11 +28,12 @@ this class. import array +from oslo_log import log as logging + from nova import exception from nova.i18n import _LW from nova.keymgr import key from nova.keymgr import key_mgr -from nova.openstack.common import log as logging from nova.openstack.common import uuidutils from nova import utils diff --git a/nova/keymgr/single_key_mgr.py b/nova/keymgr/single_key_mgr.py index ca955c6dcd..f12b35e8fe 100644 --- a/nova/keymgr/single_key_mgr.py +++ b/nova/keymgr/single_key_mgr.py @@ -18,11 +18,11 @@ An implementation of a key manager that returns a single key in response to all invocations of get_key. """ +from oslo_log import log as logging from nova import exception from nova.i18n import _, _LW from nova.keymgr import mock_key_mgr -from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) |