From cef1fea688e974585a9a2aea5017cd4df3bab1f5 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Tue, 28 Oct 2014 08:49:57 -0400 Subject: 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 --- nova/volume/encryptors/luks.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'nova/volume') 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 -- cgit v1.2.1