diff options
| author | Anthony Young <sleepsonthefloor@gmail.com> | 2011-01-10 13:44:45 -0800 |
|---|---|---|
| committer | Anthony Young <sleepsonthefloor@gmail.com> | 2011-01-10 13:44:45 -0800 |
| commit | 4edfa8ea26f8e820674e8bebbe34b6ed5885a69b (patch) | |
| tree | c74ad6915176e169a38d2601e6fb805e2806e8a7 /nova/api | |
| parent | 220259d6ca9131c738a2d4ea9cd28ca64edbcfeb (diff) | |
| download | nova-4edfa8ea26f8e820674e8bebbe34b6ed5885a69b.tar.gz nova-4edfa8ea26f8e820674e8bebbe34b6ed5885a69b.tar.xz nova-4edfa8ea26f8e820674e8bebbe34b6ed5885a69b.zip | |
consolidate boto_extensions.py and euca-get-ajax-console, fix bugs
from previous trunk merge
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 17b9a14fb..b426710bc 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -500,7 +500,7 @@ class CloudController(object): def get_ajax_console(self, context, instance_id, **kwargs): ec2_id = instance_id[0] - internal_id = ec2_id_to_internal_id(ec2_id) + internal_id = ec2_id_to_id(ec2_id) return self.compute_api.get_ajax_console(context, internal_id) def describe_volumes(self, context, volume_id=None, **kwargs): |