diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-09 07:02:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-09 07:02:24 +0000 |
| commit | f9029d36e8a70d85ee31eed673c625b5199030c2 (patch) | |
| tree | a433497f78aa46bfe7e8053d44012a3540def6a2 /nova/tests | |
| parent | 51653257ee911e6d86da187d84a28d3625879111 (diff) | |
| parent | 0778420dcd94b935d7c6dd075e49041e497cf462 (diff) | |
Merge "Move global s3 opts into nova.image.s3"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_objectstore.py | 2 |
1 files changed, 1 insertions, 1 deletions
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 |