diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2012-11-21 23:29:52 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2012-11-28 15:04:34 +0000 |
| commit | 6f98b96d380db994501736735f76cdcefaaab26a (patch) | |
| tree | e9c2ddf67ff2206a9048f3359c1d43ee74b9f51f | |
| parent | 4408b6bb43353624b525ff674f5aaad46efc8438 (diff) | |
| download | nova-6f98b96d380db994501736735f76cdcefaaab26a.tar.gz nova-6f98b96d380db994501736735f76cdcefaaab26a.tar.xz nova-6f98b96d380db994501736735f76cdcefaaab26a.zip | |
Remove default_image config option
The value of this option hasn't been used outside of the tests since
the very early days of the project. There's no particular reason
to have a config option for this test value, so just delete it.
blueprint: scope-config-opts
Change-Id: I00a08d4dc539f92f4fa4bd8c3c8756e5029d193f
| -rw-r--r-- | nova/config.py | 3 | ||||
| -rw-r--r-- | nova/tests/api/ec2/test_cloud.py | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/nova/config.py b/nova/config.py index a55a776ae..f4118466f 100644 --- a/nova/config.py +++ b/nova/config.py @@ -163,9 +163,6 @@ global_opts = [ cfg.IntOpt('metadata_port', default=8775, help='the port for the metadata api port'), - cfg.StrOpt('default_image', - default='ami-11111', - help='default image to use, testing only'), cfg.StrOpt('default_instance_type', default='m1.small', help='default instance type to use, testing only'), diff --git a/nova/tests/api/ec2/test_cloud.py b/nova/tests/api/ec2/test_cloud.py index 34142b0ec..6a3caa0e5 100644 --- a/nova/tests/api/ec2/test_cloud.py +++ b/nova/tests/api/ec2/test_cloud.py @@ -50,7 +50,6 @@ from nova import volume CONF = cfg.CONF CONF.import_opt('compute_driver', 'nova.virt.driver') -CONF.import_opt('default_image', 'nova.config') CONF.import_opt('default_instance_type', 'nova.config') CONF.import_opt('use_ipv6', 'nova.config') LOG = logging.getLogger(__name__) @@ -1570,7 +1569,7 @@ class CloudTestCase(test.TestCase): self.context, **kwargs) def test_run_instances_image_status_active(self): - kwargs = {'image_id': CONF.default_image, + kwargs = {'image_id': 'ami-00000001', 'instance_type': CONF.default_instance_type, 'max_count': 1} run_instances = self.cloud.run_instances |