Author: tomaz
Date: Mon Jun 3 22:17:01 2013
New Revision: 1489206
URL: http://svn.apache.org/r1489206
Log:
Backport commit from trunk.
Modified:
libcloud/branches/0.12.x/ (props changed)
libcloud/branches/0.12.x/CHANGES
libcloud/branches/0.12.x/libcloud/compute/drivers/linode.py
Propchange: libcloud/branches/0.12.x/
------------------------------------------------------------------------------
Merged /libcloud/trunk:r1489200
Modified: libcloud/branches/0.12.x/CHANGES
URL:
http://svn.apache.org/viewvc/libcloud/branches/0.12.x/CHANGES?rev=1489206&r1=1489205&r2=1489206&view=diff
==============================================================================
--- libcloud/branches/0.12.x/CHANGES (original)
+++ libcloud/branches/0.12.x/CHANGES Mon Jun 3 22:17:01 2013
@@ -62,6 +62,10 @@ Changes with Apache Libcloud in deveplom
- Update Gandi driver to handle new billing model. (LIBCLOUD-317)
[Aymeric Barantal]
+ - Fix a bug in the Linode driver and remove extra newline which is added
+ when generating a random root password in create_node. (LIBCLOUD-334)
+ [Juan Carlos Moreno]
+
*) Storage
- Fix an issue with double encoding the container name in the CloudFiles
Modified: libcloud/branches/0.12.x/libcloud/compute/drivers/linode.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/0.12.x/libcloud/compute/drivers/linode.py?rev=1489206&r1=1489205&r2=1489206&view=diff
==============================================================================
--- libcloud/branches/0.12.x/libcloud/compute/drivers/linode.py (original)
+++ libcloud/branches/0.12.x/libcloud/compute/drivers/linode.py Mon Jun 3
22:17:01 2013
@@ -319,7 +319,7 @@ class LinodeNodeDriver(NodeDriver):
# Step 2: linode.disk.createfromdistribution
if not root:
- root = binascii.b2a_base64(os.urandom(8)).decode('ascii')
+ root = binascii.b2a_base64(os.urandom(8)).decode('ascii').strip()
params = {
"api_action": "linode.disk.createfromdistribution",
