Updated Branches: refs/heads/master a3bb86179 -> 5fa53c02f
Add c3 instance types to Spark EC2 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.lundg...@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 19b4bb2b444f1dbc4592bf3d58b17652e0ae6d6b) Signed-off-by: Patrick Wendell <pwend...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/5fa53c02 Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/5fa53c02 Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/5fa53c02 Branch: refs/heads/master Commit: 5fa53c02fc89af7328a659045c954d72bf0b8664 Parents: a3bb861 Author: Christian Lundgren <christian.lundg...@gameanalytics.com> Authored: Thu Feb 13 12:44:21 2014 -0800 Committer: Patrick Wendell <pwend...@gmail.com> Committed: Thu Feb 13 12:46:47 2014 -0800 ---------------------------------------------------------------------- ec2/spark_ec2.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/5fa53c02/ec2/spark_ec2.py ---------------------------------------------------------------------- diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index e7cb5ab..eea63fe 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -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] @@ -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]
