summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorBrian Waldon <brian.waldon@rackspace.com>2011-09-23 16:39:21 -0400
committerBrian Waldon <brian.waldon@rackspace.com>2011-09-23 16:40:33 -0400
commitddb6945e8fbb8a00d5b67a6a6b8a069b7642022d (patch)
treebcf32f599cff5c9bea8baa9d805905e0f529c2bb /nova/compute
parent4e94ec1a0a566b66f09b734e6ffe964b4b3b4bee (diff)
Fixing bug 857712
Change-Id: I495363b44d9da96d66f85c2a621393329830aeb3
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/api.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 54c847a0a..cfde9cd2f 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -219,9 +219,9 @@ class API(base.Base):
image_href)
image = image_service.show(context, image_id)
- if instance_type['memory_mb'] < int(image.get('min_ram', 0)):
+ if instance_type['memory_mb'] < int(image.get('min_ram') or 0):
raise exception.InstanceTypeMemoryTooSmall()
- if instance_type['local_gb'] < int(image.get('min_disk', 0)):
+ if instance_type['local_gb'] < int(image.get('min_disk') or 0):
raise exception.InstanceTypeDiskTooSmall()
config_drive_id = None