svn commit: r1426126 - in /libcloud/trunk: CHANGES libcloud/compute/drivers/elasticstack.py

[to...@apache.org]

Author: tomaz
Date: Thu Dec 27 06:06:51 2012
New Revision: 1426126

URL: http://svn.apache.org/viewvc?rev=1426126&view=rev
Log:
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.

Reported by Rick Copeland on the mailing list ("ElasticHosts Problems?").

Modified:
    libcloud/trunk/CHANGES
    libcloud/trunk/libcloud/compute/drivers/elasticstack.py

Modified: libcloud/trunk/CHANGES
URL: http://svn.apache.org/viewvc/libcloud/trunk/CHANGES?rev=1426126&r1=1426125&r2=1426126&view=diff
==============================================================================
--- libcloud/trunk/CHANGES (original)
+++ libcloud/trunk/CHANGES Thu Dec 27 06:06:51 2012
@@ -76,6 +76,11 @@ Changes with Apache Libcloud in developm
      (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.
+     [Rick Copeland, Tomaz Muraus]
+
   *) Storage
 
     - Add a new local storage driver.

Modified: libcloud/trunk/libcloud/compute/drivers/elasticstack.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/drivers/elasticstack.py?rev=1426126&r1=1426125&r2=1426126&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/drivers/elasticstack.py (original)
+++ libcloud/trunk/libcloud/compute/drivers/elasticstack.py Thu Dec 27 06:06:51 2012
@@ -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:ip': 'auto', 'vnc:password': vnc_password})
+            node_data.update({'vnc:password': vnc_password})
 
         response = self.connection.request(
             action='/servers/create', data=json.dumps(node_data),
@@ -463,9 +463,11 @@ class ElasticStackBaseNodeDriver(NodeDri
                  'mem': data['mem'],
                  'started': data['started']}
 
-        if 'vnc:ip' in data and 'vnc:password' in data:
-            extra.update({'vnc_ip': data['vnc:ip'],
-                          'vnc_password': data['vnc:password']})
+        if 'vnc:ip' in data:
+            extra['vnc:ip'] = data['vnc:ip']
+
+        if 'vnc:password' in data:
+            extra['vnc:password'] = data['vnc:password']
 
         if ssh_password:
             extra.update({'password': ssh_password})