Repository: libcloud Updated Branches: refs/heads/trunk 18487b291 -> 8a7f46622
FAM-657 Added eu-west-2 AWS region Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/cb2fc661 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/cb2fc661 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/cb2fc661 Branch: refs/heads/trunk Commit: cb2fc661c52fe6ff402ac1a5e71bb3bd895957a5 Parents: e1e5c87 Author: Marat Komarov <[email protected]> Authored: Sun Jan 29 10:10:29 2017 +0200 Committer: Anthony Shaw <[email protected]> Committed: Sat Apr 1 15:50:22 2017 +1100 ---------------------------------------------------------------------- libcloud/compute/drivers/ec2.py | 64 ++++++++++++++++++++++++++++++++++++ libcloud/compute/types.py | 2 ++ 2 files changed, 66 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/cb2fc661/libcloud/compute/drivers/ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index 9545728..997d761 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -1090,6 +1090,70 @@ REGION_DETAILS = { 'x1.32xlarge' ] }, + # EU (London) Region + 'eu-west-2': { + 'endpoint': 'ec2.eu-west-2.amazonaws.com', + 'api_name': 'ec2_eu_west_london', + 'country': 'United Kingdom', + 'signature_version': '2', + 'instance_types': [ + 't1.micro', + 'm1.small', + 'm1.medium', + 'm1.large', + 'm1.xlarge', + 'm2.xlarge', + 'm2.2xlarge', + 'm2.4xlarge', + 'm3.medium', + 'm3.large', + 'm3.xlarge', + 'm3.2xlarge', + 'm4.large', + 'm4.xlarge', + 'm4.2xlarge', + 'm4.4xlarge', + 'm4.10xlarge', + 'm4.16xlarge', + 'c1.medium', + 'c1.xlarge', + 'cc2.8xlarge', + 'c3.large', + 'c3.xlarge', + 'c3.2xlarge', + 'c3.4xlarge', + 'c3.8xlarge', + 'c4.large', + 'c4.xlarge', + 'c4.2xlarge', + 'c4.4xlarge', + 'c4.8xlarge', + 'cg1.4xlarge', + 'g2.2xlarge', + 'g2.8xlarge', + 'cr1.8xlarge', + 'hs1.8xlarge', + 'i2.xlarge', + 'i2.2xlarge', + 'i2.4xlarge', + 'i2.8xlarge', + 'd2.xlarge', + 'd2.2xlarge', + 'd2.4xlarge', + 'd2.8xlarge', + 'r3.large', + 'r3.xlarge', + 'r3.2xlarge', + 'r3.4xlarge', + 'r3.8xlarge', + 't2.nano', + 't2.micro', + 't2.small', + 't2.medium', + 't2.large', + 'x1.32xlarge' + ] + }, # EU (Frankfurt) Region 'eu-central-1': { 'endpoint': 'ec2.eu-central-1.amazonaws.com', http://git-wip-us.apache.org/repos/asf/libcloud/blob/cb2fc661/libcloud/compute/types.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/types.py b/libcloud/compute/types.py index aa5a13e..66405bd 100644 --- a/libcloud/compute/types.py +++ b/libcloud/compute/types.py @@ -184,6 +184,7 @@ class Provider(Type): EC2_US_EAST_OHIO = 'ec2_us_east_ohio' EC2_EU = 'ec2_eu_west' # deprecated name EC2_EU_WEST = 'ec2_eu_west' + EC2_EU_WEST2 = 'ec2_eu_west_london' EC2_US_WEST = 'ec2_us_west' EC2_AP_SOUTHEAST = 'ec2_ap_southeast' EC2_AP_NORTHEAST = 'ec2_ap_northeast' @@ -228,6 +229,7 @@ OLD_CONSTANT_TO_NEW_MAPPING = { Provider.EC2_US_EAST_OHIO: Provider.EC2, Provider.EC2_EU: Provider.EC2, Provider.EC2_EU_WEST: Provider.EC2, + Provider.EC2_EU_WEST2: Provider.EC2, Provider.EC2_US_WEST: Provider.EC2, Provider.EC2_AP_SOUTHEAST: Provider.EC2, Provider.EC2_AP_SOUTHEAST2: Provider.EC2,
