Author: tomaz
Date: Fri Jun 29 22:02:14 2012
New Revision: 1355576

URL: http://svn.apache.org/viewvc?rev=1355576&view=rev
Log:
Fix a encoding bug which occured when using ex_userdata argument in the EC2
driver.

Modified:
    libcloud/trunk/libcloud/compute/drivers/ec2.py

Modified: libcloud/trunk/libcloud/compute/drivers/ec2.py
URL: 
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/drivers/ec2.py?rev=1355576&r1=1355575&r2=1355576&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/drivers/ec2.py (original)
+++ libcloud/trunk/libcloud/compute/drivers/ec2.py Fri Jun 29 22:02:14 2012
@@ -1045,7 +1045,8 @@ class EC2NodeDriver(NodeDriver):
             params['KeyName'] = kwargs['ex_keyname']
 
         if 'ex_userdata' in kwargs:
-            params['UserData'] = base64.b64encode(kwargs['ex_userdata'])
+            params['UserData'] = base64.b64encode(b(kwargs['ex_userdata'])) \
+                                       .decode('utf8')
 
         if 'ex_clienttoken' in kwargs:
             params['ClientToken'] = kwargs['ex_clienttoken']


Reply via email to