Skip to content

Commit

Permalink
Add c3 instance types to Spark EC2
Browse files Browse the repository at this point in the history
The number of disks for the c3 instance types taken from here: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/InstanceStorage.html#StorageOnInstanceTypes

Author: Christian Lundgren <christian.lundgren@gameanalytics.com>

Closes #595 from chrisavl/branch-0.9 and squashes the following commits:

c8af5f9 [Christian Lundgren] Add c3 instance types to Spark EC2
(cherry picked from commit 19b4bb2)

Signed-off-by: Patrick Wendell <pwendell@gmail.com>
  • Loading branch information
chrisavl authored and pwendell committed Feb 13, 2014
1 parent a3bb861 commit 5fa53c0
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions ec2/spark_ec2.py
Expand Up @@ -189,7 +189,12 @@ def get_spark_ami(opts):
"i2.xlarge": "hvm",
"i2.2xlarge": "hvm",
"i2.4xlarge": "hvm",
"i2.8xlarge": "hvm"
"i2.8xlarge": "hvm",
"c3.large": "pvm",
"c3.xlarge": "pvm",
"c3.2xlarge": "pvm",
"c3.4xlarge": "pvm",
"c3.8xlarge": "pvm"
}
if opts.instance_type in instance_types:
instance_type = instance_types[opts.instance_type]
Expand Down Expand Up @@ -486,7 +491,12 @@ def get_num_disks(instance_type):
"i2.xlarge": 1,
"i2.2xlarge": 2,
"i2.4xlarge": 4,
"i2.8xlarge": 8
"i2.8xlarge": 8,
"c3.large": 2,
"c3.xlarge": 2,
"c3.2xlarge": 2,
"c3.4xlarge": 2,
"c3.8xlarge": 2
}
if instance_type in disks_by_instance:
return disks_by_instance[instance_type]
Expand Down

0 comments on commit 5fa53c0

Please sign in to comment.