diff options
| author | Devin Carlen <devin.carlen@gmail.com> | 2011-02-12 18:34:36 -0800 |
|---|---|---|
| committer | Devin Carlen <devin.carlen@gmail.com> | 2011-02-12 18:34:36 -0800 |
| commit | 2e75026ef11dfac37f1449a54c0d6f85ff8bfca6 (patch) | |
| tree | 5af966fce0491b62f3e2871472dfbce1cf8dfc71 /nova/api | |
| parent | 6f6a09216458ffdba17d1960bbad723a3e71e7b2 (diff) | |
| parent | 2df3182b6e9637fe0e9ce9358a60ee874a97acb3 (diff) | |
| download | nova-2e75026ef11dfac37f1449a54c0d6f85ff8bfca6.tar.gz nova-2e75026ef11dfac37f1449a54c0d6f85ff8bfca6.tar.xz nova-2e75026ef11dfac37f1449a54c0d6f85ff8bfca6.zip | |
Merged 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 f1d3ecdd3..b16503589 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) |