diff options
| author | Josh Kearney <josh.kearney@rackspace.com> | 2011-02-23 12:10:52 -0600 |
|---|---|---|
| committer | Josh Kearney <josh.kearney@rackspace.com> | 2011-02-23 12:10:52 -0600 |
| commit | 7504531284be2d1fd6471f0ff3ef3b82a68ae469 (patch) | |
| tree | aa3bf45d2b4d4e8569e75147896bfe84f4fcb295 /nova/api | |
| parent | 94bd7e2c45ca971e318813bb1e897fb5e79ab7bd (diff) | |
| parent | 35991d1e5b1902d5a09776302d8c25761ae248d7 (diff) | |
| download | nova-7504531284be2d1fd6471f0ff3ef3b82a68ae469.tar.gz nova-7504531284be2d1fd6471f0ff3ef3b82a68ae469.tar.xz nova-7504531284be2d1fd6471f0ff3ef3b82a68ae469.zip | |
Merged trunk
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 882cdcfc9..99b6d5cb6 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -529,8 +529,9 @@ class CloudController(object): def get_ajax_console(self, context, instance_id, **kwargs): ec2_id = instance_id[0] - internal_id = ec2_id_to_id(ec2_id) - return self.compute_api.get_ajax_console(context, internal_id) + instance_id = ec2_id_to_id(ec2_id) + return self.compute_api.get_ajax_console(context, + instance_id=instance_id) def describe_volumes(self, context, volume_id=None, **kwargs): if volume_id: |