From 0778420dcd94b935d7c6dd075e49041e497cf462 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@redhat.com>
Date: Tue, 8 Jan 2013 06:37:20 +0000
Subject: Move global s3 opts into nova.image.s3

s3_host and s3_port are only used in nova.image.s3.

blueprint: scope-config-opts
Change-Id: Ia841406ebe7c03b2a58392e2453118e2646ad7ce
---
 nova/tests/test_objectstore.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_objectstore.py b/nova/tests/test_objectstore.py
index 8885b3554..e76a31ee2 100644
--- a/nova/tests/test_objectstore.py
+++ b/nova/tests/test_objectstore.py
@@ -34,7 +34,7 @@ from nova import test
 from nova import wsgi
 
 CONF = cfg.CONF
-CONF.import_opt('s3_host', 'nova.config')
+CONF.import_opt('s3_host', 'nova.image.s3')
 
 # Create a unique temporary directory. We don't delete after test to
 # allow checking the contents after running tests. Users and/or tools
-- 
cgit