Repository: libcloud Updated Branches: refs/heads/trunk ae5b06989 -> ade53813e
Stage changes for South Korea region for EC2 Closes #681 Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/ade53813 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/ade53813 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/ade53813 Branch: refs/heads/trunk Commit: ade53813e58d35734a9aeb552e505a191cce69f2 Parents: ae5b069 Author: anthony-shaw <anthony.p.s...@gmail.com> Authored: Wed Jan 13 11:34:26 2016 +1100 Committer: anthony-shaw <anthony.p.s...@gmail.com> Committed: Wed Jan 13 11:38:47 2016 +1100 ---------------------------------------------------------------------- contrib/scrape-ec2-prices.py | 2 ++ libcloud/compute/drivers/ec2.py | 38 ++++++++++++++++++++++++++++++++++++ libcloud/data/pricing.json | 34 ++++++++++++++++---------------- 3 files changed, 57 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/ade53813/contrib/scrape-ec2-prices.py ---------------------------------------------------------------------- diff --git a/contrib/scrape-ec2-prices.py b/contrib/scrape-ec2-prices.py index b222705..ea8f298 100755 --- a/contrib/scrape-ec2-prices.py +++ b/contrib/scrape-ec2-prices.py @@ -44,6 +44,7 @@ EC2_REGIONS = [ 'ap-southeast-1', 'ap-southeast-2', 'ap-northeast-1', + 'ap-northeast-2', 'sa-east-1' ] @@ -110,6 +111,7 @@ REGION_NAME_MAP = { 'ap-southeast-2': 'ec2_ap_southeast_2', 'apac-tokyo': 'ec2_ap_northeast', 'ap-northeast-1': 'ec2_ap_northeast', + 'ap-northeast-2': 'ec2_ap_northeast', 'sa-east-1': 'ec2_sa_east', 'us-gov-west-1': 'ec2_us_govwest' } http://git-wip-us.apache.org/repos/asf/libcloud/blob/ade53813/libcloud/compute/drivers/ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index 8a52bdb..0d41443 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -1037,6 +1037,44 @@ REGION_DETAILS = { 't2.large' ] }, + # Asia Pacific (Seoul) Region + 'ap-northeast-2': { + 'endpoint': 'ec2.ap-northeast-2.amazonaws.com', + 'api_name': 'ec2_ap_northeast', + 'country': 'South Korea', + 'signature_version': '2', + 'instance_types': [ + 'c4.large', + 'c4.xlarge', + 'c4.2xlarge', + 'c4.4xlarge', + 'c4.8xlarge', + 'm4.large', + 'm4.xlarge', + 'm4.2xlarge', + 'm4.4xlarge', + 'm4.10xlarge', + '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' + ] + }, # South America (Sao Paulo) Region 'sa-east-1': { 'endpoint': 'ec2.sa-east-1.amazonaws.com', http://git-wip-us.apache.org/repos/asf/libcloud/blob/ade53813/libcloud/data/pricing.json ---------------------------------------------------------------------- diff --git a/libcloud/data/pricing.json b/libcloud/data/pricing.json index 6903143..bb0dac4 100644 --- a/libcloud/data/pricing.json +++ b/libcloud/data/pricing.json @@ -36,11 +36,11 @@ "c3.2xlarge": "0.511", "c3.4xlarge": "1.021", "c3.8xlarge": "2.043", - "c4.large": "0.133", - "c4.xlarge": "0.265", - "c4.2xlarge": "0.531", - "c4.4xlarge": "1.061", - "c4.8xlarge": "2.122", + "c4.large": "0.120", + "c4.xlarge": "0.239", + "c4.2xlarge": "0.478", + "c4.4xlarge": "0.955", + "c4.8xlarge": "1.910", "cc2.8xlarge": "2.349", "cg1.4xlarge": "N/A", "cr1.8xlarge": "4.105", @@ -67,22 +67,22 @@ "m3.large": "0.193", "m3.xlarge": "0.385", "m3.2xlarge": "0.77", - "m4.large": "0.174", - "m4.xlarge": "0.348", - "m4.2xlarge": "0.695", - "m4.4xlarge": "1.391", - "m4.10xlarge": "3.477", - "r3.large": "0.2", + "m4.large": "0.165", + "m4.xlarge": "0.331", + "m4.2xlarge": "0.660", + "m4.4xlarge": "1.321", + "m4.10xlarge": "3.303", + "r3.large": "0.200", "r3.xlarge": "0.399", "r3.2xlarge": "0.798", "r3.4xlarge": "1.596", "r3.8xlarge": "3.192", "t1.micro": "0.026", - "t2.micro": "0.02", - "t2.small": "0.04", - "t2.medium": "0.08", - "t2.large": "0.16", - "t2.nano": "0.01" + "t2.micro": "0.020", + "t2.small": "0.040", + "t2.medium": "0.080", + "t2.large": "0.160", + "t2.nano": "0.010" }, "ec2_ap_southeast": { "c1.medium": "0.164", @@ -1034,5 +1034,5 @@ } }, "storage": {}, - "updated": 1452087048 + "updated": 1452645090 } \ No newline at end of file
