]> xenbits.xensource.com Git - osstest/openstack-nova.git/commitdiff
Remove hard coded m1.tiny behavior.
authorMandell Degerness <mdegerne@gmail.com>
Thu, 2 Feb 2012 18:46:50 +0000 (18:46 +0000)
committerMandell Degerness <mdegerne@gmail.com>
Thu, 2 Feb 2012 20:42:14 +0000 (20:42 +0000)
It makes more sense to only care about local_gb.

Fixes bug # 851301

Change-Id: I13236020975be8643b227fc2700f2ecefffa5eb7

nova/virt/libvirt/connection.py

index 905480f1877ba8288b1c45c53fcd2e3655c2ff19..8e9b7c4c90ac5a853c57c47c69417c092f217bbc 100644 (file)
@@ -942,7 +942,7 @@ class LibvirtConnection(driver.ComputeDriver):
 
         inst_type_id = inst['instance_type_id']
         inst_type = instance_types.get_instance_type(inst_type_id)
-        if inst_type['name'] == 'm1.tiny' or suffix == '.rescue':
+        if size == 0 or suffix == '.rescue':
             size = None
             root_fname += "_sm"
         else: