diff options
| author | Cerberus <matt.dietz@rackspace.com> | 2011-02-28 15:42:54 -0600 |
|---|---|---|
| committer | Cerberus <matt.dietz@rackspace.com> | 2011-02-28 15:42:54 -0600 |
| commit | 8a9130eae5a421c52573a0fb34fb0125e594ef83 (patch) | |
| tree | c2612ae7cba187abc1714f74a5d1408accadd010 /nova/compute | |
| parent | 8da6796789767b1341cb5a650066b67ad3191c74 (diff) | |
| parent | 78bd53a44a529f0c6641357fa001d4d037fbc375 (diff) | |
| download | nova-8a9130eae5a421c52573a0fb34fb0125e594ef83.tar.gz nova-8a9130eae5a421c52573a0fb34fb0125e594ef83.tar.xz nova-8a9130eae5a421c52573a0fb34fb0125e594ef83.zip | |
Merge from trunk and mega conflict resolution
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 1 | ||||
| -rw-r--r-- | nova/compute/instance_types.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 927dc062d..52d30c7f7 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -129,6 +129,7 @@ class API(base.Base): kernel_id = image.get('kernel_id', None) if ramdisk_id is None: ramdisk_id = image.get('ramdisk_id', None) + # FIXME(sirp): is there a way we can remove null_kernel? # No kernel and ramdisk for raw images if kernel_id == str(FLAGS.null_kernel): kernel_id = None diff --git a/nova/compute/instance_types.py b/nova/compute/instance_types.py index 309313fd0..7a2a5baa3 100644 --- a/nova/compute/instance_types.py +++ b/nova/compute/instance_types.py @@ -45,6 +45,6 @@ def get_by_type(instance_type): def get_by_flavor_id(flavor_id): for instance_type, details in INSTANCE_TYPES.iteritems(): - if details['flavorid'] == flavor_id: + if details['flavorid'] == int(flavor_id): return instance_type return FLAGS.default_instance_type |