From c38871690702ad3b6b39845ae33ee71465a8e95c Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yorik.sar@gmail.com>
Date: Tue, 3 May 2011 11:05:45 +0400
Subject: Moved reencoding logic to compute manager and cloud EC2 API.

---
 nova/api/ec2/cloud.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/api')

diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 94fbf19ff..187f1399f 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -540,7 +540,7 @@ class CloudController(object):
         now = datetime.datetime.utcnow()
         return {"InstanceId": ec2_id,
                 "Timestamp": now,
-                "output": base64.b64encode(output)}
+                "output": base64.b64encode(output.encode('utf-8','replace'))}
 
     def get_ajax_console(self, context, instance_id, **kwargs):
         ec2_id = instance_id[0]
-- 
cgit