From 542909e52a6f3f2a9891b710f3755ea7c033a8d0 Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yorik.sar@gmail.com>
Date: Thu, 28 Apr 2011 14:41:56 +0400
Subject: Sanitize get_console_output in libvirt_conn

---
 nova/virt/libvirt_conn.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova')

diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 15adcccee..54186ced0 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -695,7 +695,7 @@ class LibvirtConnection(driver.ComputeDriver):
         else:
             fpath = console_log
 
-        return self._dump_file(fpath)
+        return self._dump_file(fpath).decode('utf8','replace').encode('ascii','replace')
 
     @exception.wrap_exception
     def get_ajax_console(self, instance):
-- 
cgit