summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-03-30 12:34:10 -0700
committerVishvananda Ishaya <vishvananda@gmail.com>2011-03-30 12:34:10 -0700
commit1703592992ebdd5bbf19952f79f05022a4cdc849 (patch)
tree54ca1082b409edb4c3d7a40f922e377355c03454 /nova/api
parent323eb60884cf8736448d997068d32f252d22e7f3 (diff)
remove all references to image_type and change nova-manage upload to set container format more intelligently
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/servers.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index f7696d918..d640e8684 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -562,7 +562,7 @@ class Controller(wsgi.Controller):
_("Cannot build from image %(image_id)s, status not active") %
locals())
- if image_meta['properties']['disk_format'] != 'ami':
+ if image_meta.get('container_format') != 'ami':
return None, None
try: