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/02/09 13:42:52 UTC
svn commit: r1444352 -
/libcloud/branches/0.12.x/libcloud/compute/drivers/ec2.py
Author: tomaz
Date: Sat Feb 9 12:42:52 2013
New Revision: 1444352
URL: http://svn.apache.org/r1444352
Log:
Fix an issue introduced when removing "datacenter" stuff.
Part of LIBCLOUD-290.
Modified:
libcloud/branches/0.12.x/libcloud/compute/drivers/ec2.py
Modified: libcloud/branches/0.12.x/libcloud/compute/drivers/ec2.py
URL: http://svn.apache.org/viewvc/libcloud/branches/0.12.x/libcloud/compute/drivers/ec2.py?rev=1444352&r1=1444351&r2=1444352&view=diff
==============================================================================
--- libcloud/branches/0.12.x/libcloud/compute/drivers/ec2.py (original)
+++ libcloud/branches/0.12.x/libcloud/compute/drivers/ec2.py Sat Feb 9 12:42:52 2013
@@ -1399,6 +1399,10 @@ class EC2NodeDriver(BaseEC2NodeDriver):
website = 'http://aws.amazon.com/ec2/'
path = '/'
+ region_name = 'us-east-1'
+ country = 'USA'
+ api_name = 'ec2_us_east'
+
features = {'create_node': ['ssh_key']}
NODE_STATE_MAP = {
@@ -1408,25 +1412,6 @@ class EC2NodeDriver(BaseEC2NodeDriver):
'terminated': NodeState.TERMINATED
}
- def __init__(self, key, secret=None, secure=True, host=None, port=None,
- datacenter='us-east-1', **kwargs):
- if hasattr(self, '_datacenter'):
- datacenter = self._datacenter
-
- if datacenter not in VALID_EC2_DATACENTERS:
- raise ValueError('Invalid datacenter: %s' % (datacenter))
-
- details = REGION_DETAILS[datacenter]
- self.region_name = datacenter
- self.api_name = details['api_name']
- self.country = details['country']
-
- self.connectionCls.host = details['endpoint']
-
- super(EC2NodeDriver, self).__init__(key=key, secret=secret,
- secure=secure, host=host,
- port=port, **kwargs)
-
class IdempotentParamError(LibcloudError):
"""