summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/instance_types.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/nova/compute/instance_types.py b/nova/compute/instance_types.py
index d38d76ded..0e20982e3 100644
--- a/nova/compute/instance_types.py
+++ b/nova/compute/instance_types.py
@@ -28,12 +28,12 @@ from nova import exception
FLAGS = flags.FLAGS
# FIXME(kpepple) for dynamic flavors
-INSTANCE_TYPES = {
- 'm1.tiny': dict(memory_mb=512, vcpus=1, local_gb=0, flavorid=1),
- 'm1.small': dict(memory_mb=2048, vcpus=1, local_gb=20, flavorid=2),
- 'm1.medium': dict(memory_mb=4096, vcpus=2, local_gb=40, flavorid=3),
- 'm1.large': dict(memory_mb=8192, vcpus=4, local_gb=80, flavorid=4),
- 'm1.xlarge': dict(memory_mb=16384, vcpus=8, local_gb=160, flavorid=5)}
+# INSTANCE_TYPES = {
+# 'm1.tiny': dict(memory_mb=512, vcpus=1, local_gb=0, flavorid=1),
+# 'm1.small': dict(memory_mb=2048, vcpus=1, local_gb=20, flavorid=2),
+# 'm1.medium': dict(memory_mb=4096, vcpus=2, local_gb=40, flavorid=3),
+# 'm1.large': dict(memory_mb=8192, vcpus=4, local_gb=80, flavorid=4),
+# 'm1.xlarge': dict(memory_mb=16384, vcpus=8, local_gb=160, flavorid=5)}
def get_all_types():