diff options
| author | Cerberus <matt.dietz@rackspace.com> | 2011-02-08 11:07:55 -0600 |
|---|---|---|
| committer | Cerberus <matt.dietz@rackspace.com> | 2011-02-08 11:07:55 -0600 |
| commit | 39f2ec9ba1b9f589d665b25551307cccf66a35ca (patch) | |
| tree | 61eb963e13aeed538f3e497228c1bd3527a98202 /nova/api | |
| parent | 49e07d0581317daf1bb605d56575c62743a210be (diff) | |
| parent | 035136525ef7944d3da4dcf8a4b0d28840bdfae3 (diff) | |
| download | nova-39f2ec9ba1b9f589d665b25551307cccf66a35ca.tar.gz nova-39f2ec9ba1b9f589d665b25551307cccf66a35ca.tar.xz nova-39f2ec9ba1b9f589d665b25551307cccf66a35ca.zip | |
Merge from trunk
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 00d044e95..c80e1168a 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -512,8 +512,11 @@ class CloudController(object): def get_console_output(self, context, instance_id, **kwargs): LOG.audit(_("Get console output for instance %s"), instance_id, context=context) - # instance_id is passed in as a list of instances - ec2_id = instance_id[0] + # instance_id may be passed in as a list of instances + if type(instance_id) == list: + ec2_id = instance_id[0] + else: + ec2_id = instance_id instance_id = ec2_id_to_id(ec2_id) output = self.compute_api.get_console_output( context, instance_id=instance_id) |