diff options
| author | Dan Prince <dan.prince@rackspace.com> | 2011-06-30 13:25:41 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-06-30 13:25:41 +0000 |
| commit | 0c2cbccfb596f57008c87aa4dc2210eca92a4c8f (patch) | |
| tree | 64013311dc2bc07b6dea06e48fe6af569e8fd28a /nova/api | |
| parent | edfacac605f6887d1b093c8c79a143d28e2083d9 (diff) | |
| parent | d1c5b8c9a5c54a7000d21451ff4649b1a772dfad (diff) | |
| download | nova-0c2cbccfb596f57008c87aa4dc2210eca92a4c8f.tar.gz nova-0c2cbccfb596f57008c87aa4dc2210eca92a4c8f.tar.xz nova-0c2cbccfb596f57008c87aa4dc2210eca92a4c8f.zip | |
Update the ec2 get_metadata handler so it works with the most recent version of the compute API get_all call which now returns a list if there is only a single record.
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 9aaf37a2d..25aeceea6 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -152,7 +152,7 @@ class CloudController(object): # This ensures that all attributes of the instance # are populated. - instance_ref = db.instance_get(ctxt, instance_ref['id']) + instance_ref = db.instance_get(ctxt, instance_ref[0]['id']) mpi = self._get_mpi_data(ctxt, instance_ref['project_id']) if instance_ref['key_name']: |