diff options
| author | jaypipes@gmail.com <> | 2010-10-05 18:00:48 -0400 |
|---|---|---|
| committer | jaypipes@gmail.com <> | 2010-10-05 18:00:48 -0400 |
| commit | fc61a9c9fbe20e79128cc6b9b91f164c8f0e406a (patch) | |
| tree | ea4c17996f06a326d3bd0149ea8d88e3135c172b /nova/api | |
| parent | fbd1bc015bd5615963b9073eefb895ea04c55a3e (diff) | |
| parent | d58da66e2958ff3bb32c8f764c90526be5c601af (diff) | |
Merge trunk
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 7f5f4c4e9..175bb493c 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -262,7 +262,7 @@ class CloudController(object): # ec2_id_list is passed in as a list of instances ec2_id = ec2_id_list[0] internal_id = ec2_id_to_internal_id(ec2_id) - instance_ref = db.instance_get_by_ec2_id(context, internal_id) + instance_ref = db.instance_get_by_internal_id(context, internal_id) return rpc.call('%s.%s' % (FLAGS.compute_topic, instance_ref['host']), {"method": "get_console_output", |