diff options
| author | Monsyne Dragon <mdragon@rackspace.com> | 2011-03-09 18:13:59 +0000 |
|---|---|---|
| committer | Monsyne Dragon <mdragon@rackspace.com> | 2011-03-09 18:13:59 +0000 |
| commit | 9f1847ca334b3a35130d3f6113808d7b2a949877 (patch) | |
| tree | ef25ea8988e522d7a67f98faac0ff03a5af83456 /nova/api | |
| parent | 429fdb1ee733a62052c67f4e42c62447fc716ec0 (diff) | |
| parent | f42fda8566383bf0271e5b79e1385c41731639b9 (diff) | |
| download | nova-9f1847ca334b3a35130d3f6113808d7b2a949877.tar.gz nova-9f1847ca334b3a35130d3f6113808d7b2a949877.tar.xz nova-9f1847ca334b3a35130d3f6113808d7b2a949877.zip | |
remerge trunk
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/servers.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index c2bf42b72..85999764f 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -450,7 +450,7 @@ class Controller(wsgi.Controller): _("Cannot build from image %(image_id)s, status not active") % locals()) - if image['type'] != 'machine': + if image['disk_format'] != 'ami': return None, None try: |