You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2013/01/29 22:14:50 UTC

svn commit: r1440135 - in /libcloud/branches/0.12.x: ./ CHANGES libcloud/compute/drivers/elasticstack.py

Author: tomaz
Date: Tue Jan 29 21:14:50 2013
New Revision: 1440135

URL: http://svn.apache.org/viewvc?rev=1440135&view=rev
Log:
Backport commit r1426126 from trunk.

Modified:
    libcloud/branches/0.12.x/   (props changed)
    libcloud/branches/0.12.x/CHANGES
    libcloud/branches/0.12.x/libcloud/compute/drivers/elasticstack.py

Propchange: libcloud/branches/0.12.x/
------------------------------------------------------------------------------
  Merged /libcloud/trunk:r1440132-1440134

Modified: libcloud/branches/0.12.x/CHANGES
URL: http://svn.apache.org/viewvc/libcloud/branches/0.12.x/CHANGES?rev=1440135&r1=1440134&r2=1440135&view=diff
==============================================================================
--- libcloud/branches/0.12.x/CHANGES (original)
+++ libcloud/branches/0.12.x/CHANGES Tue Jan 29 21:14:50 2013
@@ -67,9 +67,9 @@ Changes with Apache Libcloud 0.12.0:
      (LIBCLOUD-253)
      [L. Schaub]
 
-   - Modify ElasticStack driver class to not pass 'vnc:ip auto' argument to the
-     API when creating a server. It looks like this argument is not supported
-     anymore.
+   - Modify ElasticStack driver class to pass 'vnc auto' instead of
+     'vnc:ip auto' argument to the API when creating a server.
+     It looks like 'vnc:ip' has been replaced with 'vnc'.
      [Rick Copeland, Tomaz Muraus]
 
    - Add new EC2 instance type - High Storage Eight Extra Large Instance

Modified: libcloud/branches/0.12.x/libcloud/compute/drivers/elasticstack.py
URL: http://svn.apache.org/viewvc/libcloud/branches/0.12.x/libcloud/compute/drivers/elasticstack.py?rev=1440135&r1=1440134&r2=1440135&view=diff
==============================================================================
--- libcloud/branches/0.12.x/libcloud/compute/drivers/elasticstack.py (original)
+++ libcloud/branches/0.12.x/libcloud/compute/drivers/elasticstack.py Tue Jan 29 21:14:50 2013
@@ -308,7 +308,7 @@ class ElasticStackBaseNodeDriver(NodeDri
         node_data.update({'nic:0:model': nic_model, 'nic:0:dhcp': 'auto'})
 
         if vnc_password:
-            node_data.update({'vnc:password': vnc_password})
+            node_data.update({'vnc': 'auto', 'vnc:password': vnc_password})
 
         response = self.connection.request(
             action='/servers/create', data=json.dumps(node_data),