summaryrefslogtreecommitdiff
path: root/nova/storage
diff options
context:
space:
mode:
authorSean Dague <sean@dague.net>2014-10-28 08:49:57 -0400
committerSean Dague <sean@dague.net>2014-10-28 08:51:21 -0400
commitcef1fea688e974585a9a2aea5017cd4df3bab1f5 (patch)
treeeb2ac7c766fab4ea38b14fcbf6d91fd521a9464c /nova/storage
parent41f7aac903cc9e4f11262c5a2a752ef02ceb6309 (diff)
downloadnova-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/storage')
-rw-r--r--nova/storage/linuxscsi.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/storage/linuxscsi.py b/nova/storage/linuxscsi.py
index 713a082845..08577b0f6d 100644
--- a/nova/storage/linuxscsi.py
+++ b/nova/storage/linuxscsi.py
@@ -14,11 +14,10 @@
"""Generic linux scsi subsystem utilities."""
-from oslo.concurrency import processutils
-
from nova.i18n import _LW
from nova.openstack.common import log as logging
from nova.openstack.common import loopingcall
+from nova.openstack.common import processutils
from nova import utils
LOG = logging.getLogger(__name__)