diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2013-01-08 07:54:01 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2013-01-09 08:15:43 +0000 |
| commit | 44cc0cda04cd20adf057eff76af0e6ba5ee0dcad (patch) | |
| tree | 799b398b10bbb1a08545bb4a8cde7a8a680e2dfd /nova/tests | |
| parent | 2803fd8d400b7d76138b2e2c152017a3d5e49685 (diff) | |
Move default_instance_type into nova.compute
Apart from the tests, this option is only used in
nova.compute.instance_types so move it there.
blueprint: scope-config-opts
Change-Id: Iadf4011739e50455b7ad4214a778a02e244fef35
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/api/ec2/test_cinder_cloud.py | 2 | ||||
| -rw-r--r-- | nova/tests/api/ec2/test_cloud.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/tests/api/ec2/test_cinder_cloud.py b/nova/tests/api/ec2/test_cinder_cloud.py index c333def6c..8d36debd2 100644 --- a/nova/tests/api/ec2/test_cinder_cloud.py +++ b/nova/tests/api/ec2/test_cinder_cloud.py @@ -39,7 +39,7 @@ from nova import volume CONF = cfg.CONF CONF.import_opt('compute_driver', 'nova.virt.driver') -CONF.import_opt('default_instance_type', 'nova.config') +CONF.import_opt('default_instance_type', 'nova.compute.instance_types') CONF.import_opt('use_ipv6', 'nova.config') LOG = logging.getLogger(__name__) diff --git a/nova/tests/api/ec2/test_cloud.py b/nova/tests/api/ec2/test_cloud.py index e0470689a..1d8dad1e8 100644 --- a/nova/tests/api/ec2/test_cloud.py +++ b/nova/tests/api/ec2/test_cloud.py @@ -52,7 +52,7 @@ from nova import volume CONF = cfg.CONF CONF.import_opt('compute_driver', 'nova.virt.driver') -CONF.import_opt('default_instance_type', 'nova.config') +CONF.import_opt('default_instance_type', 'nova.compute.instance_types') CONF.import_opt('use_ipv6', 'nova.config') LOG = logging.getLogger(__name__) |