summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-12-14 15:11:31 +0000
committerGerrit Code Review <review@openstack.org>2012-12-14 15:11:31 +0000
commitb68bb0a2c59e2a6dfd6a0e3676f490fb801326b7 (patch)
tree2f84100918283b9cb1fb280e9aa148fbc71084dd
parent0597c1ccd31e7264395bcb451b8b6d38d5bfa92f (diff)
parent98a7161f6260e4164095ba3d864584e474647f90 (diff)
downloadnova-b68bb0a2c59e2a6dfd6a0e3676f490fb801326b7.tar.gz
nova-b68bb0a2c59e2a6dfd6a0e3676f490fb801326b7.tar.xz
nova-b68bb0a2c59e2a6dfd6a0e3676f490fb801326b7.zip
Merge "Fix use of osapi_compute_extension option in api_samples."
-rw-r--r--nova/tests/integrated/test_api_samples.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py
index 0e2cba7a9..4f73f6bfe 100644
--- a/nova/tests/integrated/test_api_samples.py
+++ b/nova/tests/integrated/test_api_samples.py
@@ -41,7 +41,8 @@ from nova.tests.integrated import integrated_helpers
CONF = cfg.CONF
CONF.import_opt('allow_resize_to_same_host', 'nova.compute.api')
-CONF.import_opt('osapi_compute_extension', 'nova.config')
+CONF.import_opt('osapi_compute_extension',
+ 'nova.api.openstack.compute.extensions')
CONF.import_opt('vpn_image_id', 'nova.config')
CONF.import_opt('osapi_compute_link_prefix', 'nova.api.openstack.common')
CONF.import_opt('osapi_glance_link_prefix', 'nova.api.openstack.common')