diff options
| author | Sean Dague <sean@dague.net> | 2014-10-28 08:49:57 -0400 |
|---|---|---|
| committer | Sean Dague <sean@dague.net> | 2014-10-28 08:51:21 -0400 |
| commit | cef1fea688e974585a9a2aea5017cd4df3bab1f5 (patch) | |
| tree | eb2ac7c766fab4ea38b14fcbf6d91fd521a9464c /nova/volume | |
| parent | 41f7aac903cc9e4f11262c5a2a752ef02ceb6309 (diff) | |
| download | nova-cef1fea688e974585a9a2aea5017cd4df3bab1f5.tar.gz | |
Revert "Switch Nova to use oslo.concurrency"
This patch made unit tests stop running (always runs 0 unit tests) we
should revert and put a check in place to prevent that from happening
so that we don't regress the rest of Nova trying to figure out the
oslo.concurrency issue.
This reverts commit 382294762b08abb1921a77b00608ac941478ce05.
Change-Id: I98b04ac2a0ba67ba8af44867799317fdf95b8aff
Diffstat (limited to 'nova/volume')
| -rw-r--r-- | nova/volume/encryptors/luks.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/volume/encryptors/luks.py b/nova/volume/encryptors/luks.py index 5fe0f74b26..63cdf5e080 100644 --- a/nova/volume/encryptors/luks.py +++ b/nova/volume/encryptors/luks.py @@ -16,9 +16,8 @@ import re -from oslo.concurrency import processutils - from nova.openstack.common import log as logging +from nova.openstack.common import processutils from nova import utils from nova.volume.encryptors import cryptsetup |