Updated Branches: refs/heads/trunk e0d39148d -> d6ca80926
Added support to the Rackspace driver for using compute and storage in the new IAD region. Signed-off-by: Tomaz Muraus <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/ddb601ef Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/ddb601ef Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/ddb601ef Branch: refs/heads/trunk Commit: ddb601efa470a5ddc7219ece4599270ebb7cd849 Parents: e0d3914 Author: Alex Gaynor <[email protected]> Authored: Tue Aug 27 13:28:54 2013 -0700 Committer: Tomaz Muraus <[email protected]> Committed: Wed Aug 28 14:23:29 2013 +0200 ---------------------------------------------------------------------- libcloud/compute/drivers/rackspace.py | 7 +++++-- libcloud/storage/drivers/cloudfiles.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/ddb601ef/libcloud/compute/drivers/rackspace.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/rackspace.py b/libcloud/compute/drivers/rackspace.py index e94c677..3a83767 100644 --- a/libcloud/compute/drivers/rackspace.py +++ b/libcloud/compute/drivers/rackspace.py @@ -32,6 +32,9 @@ ENDPOINT_ARGS_MAP = { 'ord': {'service_type': 'compute', 'name': 'cloudServersOpenStack', 'region': 'ORD'}, + 'iad': {'service_type': 'compute', + 'name': 'cloudServersOpenStack', + 'region': 'IAD'}, 'lon': {'service_type': 'compute', 'name': 'cloudServersOpenStack', 'region': 'LON'}, @@ -152,10 +155,10 @@ class RackspaceNodeDriver(OpenStack_1_1_NodeDriver): @param region: ID of the region which should be used. @type region: C{str} """ - if region not in ['dfw', 'ord', 'lon', 'syd']: + if region not in ['dfw', 'ord', 'iad', 'lon', 'syd']: raise ValueError('Invalid region: %s' % (region)) - if region in ['dfw', 'ord', 'syd']: + if region in ['dfw', 'ord', 'iad', 'syd']: self.connectionCls.auth_url = AUTH_URL_US self.api_name = 'rackspacenovaus' elif region == 'lon': http://git-wip-us.apache.org/repos/asf/libcloud/blob/ddb601ef/libcloud/storage/drivers/cloudfiles.py ---------------------------------------------------------------------- diff --git a/libcloud/storage/drivers/cloudfiles.py b/libcloud/storage/drivers/cloudfiles.py index 92e2e3a..7f0cafa 100644 --- a/libcloud/storage/drivers/cloudfiles.py +++ b/libcloud/storage/drivers/cloudfiles.py @@ -824,7 +824,7 @@ class CloudFilesStorageDriver(StorageDriver, OpenStackDriverMixin): def _ex_connection_class_kwargs(self): kwargs = {'ex_force_service_region': self.region} - if self.region in ['dfw', 'ord', 'syd']: + if self.region in ['dfw', 'ord', 'iad', 'syd']: kwargs['auth_url'] = AUTH_URL_US elif self.region == 'lon': kwargs['auth_url'] = AUTH_URL_UK
