diff options
| author | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2011-02-23 18:26:04 +0000 |
|---|---|---|
| committer | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2011-02-23 18:26:04 +0000 |
| commit | 424a0996693351d92db3b9d866d4e62b9b2ebe5b (patch) | |
| tree | 4abcfedc5ee1247a234f89bb713748772566d458 /nova/api | |
| parent | 79a4c527fbb75bc563721fa23be4ea4aa97b39ee (diff) | |
| parent | 35991d1e5b1902d5a09776302d8c25761ae248d7 (diff) | |
| download | nova-424a0996693351d92db3b9d866d4e62b9b2ebe5b.tar.gz nova-424a0996693351d92db3b9d866d4e62b9b2ebe5b.tar.xz nova-424a0996693351d92db3b9d866d4e62b9b2ebe5b.zip | |
merge 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: |