diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-12-09 19:55:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-12-09 19:55:12 +0000 |
| commit | 0c6c7700299e225aee2c86fbe725c8e146b9f0d4 (patch) | |
| tree | 070dfe871b4b877b9402cf513cd52a3b74d49fb8 | |
| parent | de6a37a7966aff79ec7b0e6f3c9b12235811e122 (diff) | |
| parent | 525ff432f8c6584015d0e7255d7b1083e0778e33 (diff) | |
Merge "_check_image_size returns are consistent"
| -rw-r--r-- | nova/compute/manager.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index c657f732a..897a8bc5e 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -358,7 +358,7 @@ class ComputeManager(manager.SchedulerDependentManager): # glance. # TODO(jk0): Should size be required in the image service? - return + return image_meta instance_type_id = instance['instance_type_id'] instance_type = instance_types.get_instance_type(instance_type_id) @@ -368,7 +368,7 @@ class ComputeManager(manager.SchedulerDependentManager): # need to handle potential situations where local_gb is 0. This is # the default for m1.tiny. if allowed_size_gb == 0: - return + return image_meta allowed_size_bytes = allowed_size_gb * 1024 * 1024 * 1024 |