diff options
| author | Josh Kearney <josh@jk0.org> | 2011-05-06 13:48:19 -0500 |
|---|---|---|
| committer | Josh Kearney <josh@jk0.org> | 2011-05-06 13:48:19 -0500 |
| commit | ff036fb229e7ff1c73d6be395fbb3b2807b9eb53 (patch) | |
| tree | 652d8dbcd7c2cae6404beb8ebad5a99cc97c40df /nova/compute | |
| parent | 791f8dc895b97caa9395a52113823bde37ae6cfa (diff) | |
| parent | 016be4ccdfe3f7791021bc717a1445b36cde371f (diff) | |
Merged trunk
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index d92f7719a..e75371741 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -759,7 +759,8 @@ class ComputeManager(manager.SchedulerDependentManager): instance_ref = self.db.instance_get(context, instance_id) LOG.audit(_("Get console output for instance %s"), instance_id, context=context) - return self.driver.get_console_output(instance_ref) + output = self.driver.get_console_output(instance_ref) + return output.decode('utf-8', 'replace').encode('ascii', 'replace') @exception.wrap_exception def get_ajax_console(self, context, instance_id): |