summaryrefslogtreecommitdiff
path: root/nova/tests/test_objectstore.py
diff options
context:
space:
mode:
Diffstat (limited to 'nova/tests/test_objectstore.py')
-rw-r--r--nova/tests/test_objectstore.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/tests/test_objectstore.py b/nova/tests/test_objectstore.py
index 3b148b509b..55490e8607 100644
--- a/nova/tests/test_objectstore.py
+++ b/nova/tests/test_objectstore.py
@@ -30,10 +30,11 @@ from boto.s3 import connection as s3
from nova import config
from nova.objectstore import s3server
+from nova.openstack.common import cfg
from nova import test
from nova import wsgi
-CONF = config.CONF
+CONF = cfg.CONF
# Create a unique temporary directory. We don't delete after test to
# allow checking the contents after running tests. Users and/or tools