diff options
| author | Davanum Srinivas <dims@linux.vnet.ibm.com> | 2015-01-10 22:26:32 -0500 |
|---|---|---|
| committer | Davanum Srinivas <davanum@gmail.com> | 2015-02-06 06:03:10 -0500 |
| commit | af2d6c9576b1ac5f3b3768870bb15d9b5cf1610b (patch) | |
| tree | 5a6d58e8d0c6cc68a732418dfbd24015460f88b1 /nova/keymgr | |
| parent | ff219370f3e1c836603b218dd3225f81ba3938b4 (diff) | |
| download | nova-af2d6c9576b1ac5f3b3768870bb15d9b5cf1610b.tar.gz | |
Switch to using oslo_* instead of oslo.*
The oslo team is recommending everyone to switch to the
non-namespaced versions of libraries. Updating the hacking
rule to include a check to prevent oslo.* import from
creeping back in.
This commit includes:
- using oslo_utils instead of oslo.utils
- using oslo_serialization instead of oslo.serialization
- using oslo_db instead of oslo.db
- using oslo_i18n instead of oslo.i18n
- using oslo_middleware instead of oslo.middleware
- using oslo_config instead of oslo.config
- using oslo_messaging instead of "from oslo import messaging"
- using oslo_vmware instead of oslo.vmware
Change-Id: I3e2eb147b321ce3e928817b62abcb7d023c5f13f
Diffstat (limited to 'nova/keymgr')
| -rw-r--r-- | nova/keymgr/__init__.py | 4 | ||||
| -rw-r--r-- | nova/keymgr/barbican.py | 4 | ||||
| -rw-r--r-- | nova/keymgr/conf_key_mgr.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/nova/keymgr/__init__.py b/nova/keymgr/__init__.py index f589e18363..79880b4d70 100644 --- a/nova/keymgr/__init__.py +++ b/nova/keymgr/__init__.py @@ -14,8 +14,8 @@ # under the License. -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils keymgr_opts = [ diff --git a/nova/keymgr/barbican.py b/nova/keymgr/barbican.py index d9de15950f..1c69d69d70 100644 --- a/nova/keymgr/barbican.py +++ b/nova/keymgr/barbican.py @@ -23,8 +23,8 @@ import binascii from barbicanclient import client as barbican_client from keystoneclient import session -from oslo.config import cfg -from oslo.utils import excutils +from oslo_config import cfg +from oslo_utils import excutils from nova import exception from nova.i18n import _ diff --git a/nova/keymgr/conf_key_mgr.py b/nova/keymgr/conf_key_mgr.py index 3cb44a5a80..fac967429f 100644 --- a/nova/keymgr/conf_key_mgr.py +++ b/nova/keymgr/conf_key_mgr.py @@ -31,7 +31,7 @@ encrypted with a key provided by this key manager actually share the same encryption key so *any* volume can be decrypted once the fixed key is known. """ -from oslo.config import cfg +from oslo_config import cfg from nova.i18n import _ from nova.keymgr import single_key_mgr |