summaryrefslogtreecommitdiffstats
path: root/nova/config.py
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2013-01-08 07:54:01 +0000
committerMark McLoughlin <markmc@redhat.com>2013-01-09 08:15:43 +0000
commit44cc0cda04cd20adf057eff76af0e6ba5ee0dcad (patch)
tree799b398b10bbb1a08545bb4a8cde7a8a680e2dfd /nova/config.py
parent2803fd8d400b7d76138b2e2c152017a3d5e49685 (diff)
downloadnova-44cc0cda04cd20adf057eff76af0e6ba5ee0dcad.tar.gz
nova-44cc0cda04cd20adf057eff76af0e6ba5ee0dcad.tar.xz
nova-44cc0cda04cd20adf057eff76af0e6ba5ee0dcad.zip
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/config.py')
-rw-r--r--nova/config.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/nova/config.py b/nova/config.py
index 320e2e9bc..95d897255 100644
--- a/nova/config.py
+++ b/nova/config.py
@@ -50,9 +50,6 @@ global_opts = [
cfg.ListOpt('enabled_apis',
default=['ec2', 'osapi_compute', 'metadata'],
help='a list of APIs to enable by default'),
- cfg.StrOpt('default_instance_type',
- default='m1.small',
- help='default instance type to use, testing only'),
cfg.StrOpt('vpn_image_id',
default='0',
help='image id used when starting up a cloudpipe vpn server'),