From 525ff432f8c6584015d0e7255d7b1083e0778e33 Mon Sep 17 00:00:00 2001 From: Aaron Lee Date: Fri, 9 Dec 2011 13:06:31 -0600 Subject: _check_image_size returns are consistent fixes lp902288 Change-Id: I5be64b97428c19dcc8fb687cebfbcbd66c7cddb4 --- nova/compute/manager.py | 4 ++-- 1 file 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 -- cgit