t2.nano instance for ec2 Closes #663
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/f856da99 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/f856da99 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/f856da99 Branch: refs/heads/trunk Commit: f856da991379f687af99873a1a5f060d772b2d89 Parents: 88e134a Author: anthony-shaw <[email protected]> Authored: Mon Dec 21 20:02:29 2015 +1100 Committer: anthony-shaw <[email protected]> Committed: Mon Dec 21 21:07:12 2015 +1100 ---------------------------------------------------------------------- libcloud/compute/drivers/ec2.py | 10 ++++++ libcloud/data/pricing.json | 59 ++++++++++++++++++++++++++++++------ 2 files changed, 59 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/f856da99/libcloud/compute/drivers/ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index dc64829..c14513c 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -591,6 +591,16 @@ INSTANCE_TYPES = { } }, # Burstable Performance General Purpose + 't2.nano': { + 'id': 't2.nano', + 'name': 'Burstable Performance Nano Instance', + 'ram': 512, + 'disk': 0, # EBS Only + 'bandwidth': None, + 'extra': { + 'cpu': 1 + } + }, 't2.micro': { 'id': 't2.micro', 'name': 'Burstable Performance Micro Instance', http://git-wip-us.apache.org/repos/asf/libcloud/blob/f856da99/libcloud/data/pricing.json ---------------------------------------------------------------------- diff --git a/libcloud/data/pricing.json b/libcloud/data/pricing.json index b43bd9f..4723fb3 100644 --- a/libcloud/data/pricing.json +++ b/libcloud/data/pricing.json @@ -42,6 +42,7 @@ "c4.4xlarge": "1.117", "c4.8xlarge": "2.234", "cc2.8xlarge": "2.349", + "cg1.4xlarge": "N/A", "cr1.8xlarge": "4.105", "d2.xlarge": "0.844", "d2.2xlarge": "1.688", @@ -80,7 +81,8 @@ "t2.micro": "0.02", "t2.small": "0.04", "t2.medium": "0.08", - "t2.large": "0.16" + "t2.large": "0.16", + "t2.nano": "0.01" }, "ec2_ap_southeast": { "c1.medium": "0.164", @@ -95,6 +97,9 @@ "c4.2xlarge": "0.608", "c4.4xlarge": "1.216", "c4.8xlarge": "2.432", + "cc2.8xlarge": "N/A", + "cg1.4xlarge": "N/A", + "cr1.8xlarge": "N/A", "d2.xlarge": "0.87", "d2.2xlarge": "1.74", "d2.4xlarge": "3.48", @@ -132,7 +137,8 @@ "t2.micro": "0.02", "t2.small": "0.04", "t2.medium": "0.08", - "t2.large": "0.16" + "t2.large": "0.16", + "t2.nano": "0.01" }, "ec2_ap_southeast_2": { "c1.medium": "0.164", @@ -147,6 +153,9 @@ "c4.2xlarge": "0.578", "c4.4xlarge": "1.155", "c4.8xlarge": "2.31", + "cc2.8xlarge": "N/A", + "cg1.4xlarge": "N/A", + "cr1.8xlarge": "N/A", "d2.xlarge": "0.87", "d2.2xlarge": "1.74", "d2.4xlarge": "3.48", @@ -187,6 +196,8 @@ "t2.large": "0.16" }, "ec2_eu_central": { + "c1.medium": "N/A", + "c1.xlarge": "N/A", "c3.large": "0.129", "c3.xlarge": "0.258", "c3.2xlarge": "0.516", @@ -197,16 +208,28 @@ "c4.2xlarge": "0.562", "c4.4xlarge": "1.125", "c4.8xlarge": "2.25", + "cc2.8xlarge": "N/A", + "cg1.4xlarge": "N/A", + "cr1.8xlarge": "N/A", "d2.xlarge": "0.794", "d2.2xlarge": "1.588", "d2.4xlarge": "3.176", "d2.8xlarge": "6.352", "g2.2xlarge": "0.772", "g2.8xlarge": "3.088", + "hi1.4xlarge": "N/A", + "hs1.8xlarge": "N/A", "i2.xlarge": "1.013", "i2.2xlarge": "2.026", "i2.4xlarge": "4.051", "i2.8xlarge": "8.102", + "m1.small": "N/A", + "m1.medium": "N/A", + "m1.large": "N/A", + "m1.xlarge": "N/A", + "m2.xlarge": "N/A", + "m2.2xlarge": "N/A", + "m2.4xlarge": "N/A", "m3.medium": "0.079", "m3.large": "0.158", "m3.xlarge": "0.315", @@ -221,6 +244,7 @@ "r3.2xlarge": "0.842", "r3.4xlarge": "1.684", "r3.8xlarge": "3.369", + "t1.micro": "N/A", "t2.micro": "0.015", "t2.small": "0.03", "t2.medium": "0.06", @@ -279,7 +303,8 @@ "t2.micro": "0.014", "t2.small": "0.028", "t2.medium": "0.056", - "t2.large": "0.112" + "t2.large": "0.112", + "t2.nano": "0.007" }, "ec2_sa_east": { "c1.medium": "0.179", @@ -289,6 +314,9 @@ "c3.2xlarge": "0.65", "c3.4xlarge": "1.3", "c3.8xlarge": "2.6", + "cc2.8xlarge": "N/A", + "cg1.4xlarge": "N/A", + "cr1.8xlarge": "N/A", "hi1.4xlarge": "N/A", "hs1.8xlarge": "N/A", "m1.small": "0.058", @@ -308,7 +336,8 @@ "t2.micro": "0.027", "t2.small": "0.054", "t2.medium": "0.108", - "t2.large": "0.216" + "t2.large": "0.216", + "t2.nano": "0.0135" }, "ec2_us_east": { "c1.medium": "0.13", @@ -363,7 +392,8 @@ "t2.micro": "0.013", "t2.small": "0.026", "t2.medium": "0.052", - "t2.large": "0.104" + "t2.large": "0.104", + "t2.nano": "0.0065" }, "ec2_us_govwest": { "c1.medium": "0.157", @@ -374,6 +404,8 @@ "c3.4xlarge": "1.008", "c3.8xlarge": "2.016", "cc2.8xlarge": "2.25", + "cg1.4xlarge": "N/A", + "cr1.8xlarge": "N/A", "hi1.4xlarge": "N/A", "hs1.8xlarge": "5.52", "i2.xlarge": "1.023", @@ -400,7 +432,8 @@ "t2.micro": "0.015", "t2.small": "0.031", "t2.medium": "0.062", - "t2.large": "0.124" + "t2.large": "0.124", + "t2.nano": "0.0075" }, "ec2_us_west": { "c1.medium": "0.148", @@ -415,6 +448,9 @@ "c4.2xlarge": "0.552", "c4.4xlarge": "1.104", "c4.8xlarge": "2.208", + "cc2.8xlarge": "N/A", + "cg1.4xlarge": "N/A", + "cr1.8xlarge": "N/A", "g2.2xlarge": "0.702", "g2.8xlarge": "2.808", "hi1.4xlarge": "N/A", @@ -448,7 +484,8 @@ "t2.micro": "0.017", "t2.small": "0.034", "t2.medium": "0.068", - "t2.large": "0.136" + "t2.large": "0.136", + "t2.nano": "0.0085" }, "ec2_us_west_oregon": { "c1.medium": "0.13", @@ -464,6 +501,7 @@ "c4.4xlarge": "0.882", "c4.8xlarge": "1.763", "cc2.8xlarge": "2", + "cg1.4xlarge": "N/A", "cr1.8xlarge": "3.5", "d2.xlarge": "0.69", "d2.2xlarge": "1.38", @@ -502,7 +540,8 @@ "t2.micro": "0.013", "t2.small": "0.026", "t2.medium": "0.052", - "t2.large": "0.104" + "t2.large": "0.104", + "t2.nano": "0.0065" }, "elastichosts": { "small": 0.1, @@ -991,5 +1030,5 @@ } }, "storage": {}, - "updated": 1449047993 -} + "updated": 1450688351 +} \ No newline at end of file
