reoder c4 instances Closes #638 Signed-off-by: Anthony Shaw <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/ee4f7ef1 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/ee4f7ef1 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/ee4f7ef1 Branch: refs/heads/cloudflare_dns_driver Commit: ee4f7ef17b8cb6cba4ff34219335322dfdbb5381 Parents: 4ed24fd Author: Amit <[email protected]> Authored: Sun Nov 22 01:33:11 2015 +0000 Committer: Anthony Shaw <[email protected]> Committed: Sun Nov 22 16:51:05 2015 +1100 ---------------------------------------------------------------------- CHANGES.rst | 4 ++++ libcloud/compute/drivers/ec2.py | 18 +++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/ee4f7ef1/CHANGES.rst ---------------------------------------------------------------------- diff --git a/CHANGES.rst b/CHANGES.rst index a655432..7d10c12 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -62,6 +62,10 @@ Compute [GITHUB-634] [Benjamin Zaitlen] +- Added C4 instance information to EC2 driver + [GITHUB-638] + [amitofs] + - Allow location of the datacenter to be supplied in ProfitBricks driver [LIBCLOUD-771, GITHUB-635] [Joel Reymont] http://git-wip-us.apache.org/repos/asf/libcloud/blob/ee4f7ef1/libcloud/compute/drivers/ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index eb3bc7b..3ddecb9 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -288,13 +288,6 @@ INSTANCE_TYPES = { 'disk': 640, # x2 'bandwidth': None }, - 'cr1.8xlarge': { - 'id': 'cr1.8xlarge', - 'name': 'High Memory Cluster Eight Extra Large', - 'ram': 244000, - 'disk': 240, - 'bandwidth': None - }, 'c4.large': { 'id': 'c4.large', 'name': 'Compute Optimized Large Instance', @@ -304,14 +297,14 @@ INSTANCE_TYPES = { }, 'c4.xlarge': { 'id': 'c4.xlarge', - 'name': 'Compute Optimized Double Extra Large Instance', + 'name': 'Compute Optimized Extra Large Instance', 'ram': 7500, 'disk': 0, 'bandwidth': None }, 'c4.2xlarge': { 'id': 'c4.2xlarge', - 'name': 'Compute Optimized Extra Large Instance', + 'name': 'Compute Optimized Double Large Instance', 'ram': 15000, 'disk': 0, 'bandwidth': None @@ -330,6 +323,13 @@ INSTANCE_TYPES = { 'disk': 0, 'bandwidth': None }, + 'cr1.8xlarge': { + 'id': 'cr1.8xlarge', + 'name': 'High Memory Cluster Eight Extra Large', + 'ram': 244000, + 'disk': 240, + 'bandwidth': None + }, 'hs1.4xlarge': { 'id': 'hs1.4xlarge', 'name': 'High Storage Quadruple Extra Large Instance',
