diff options
| author | Christian Lundgren <christian.lundgren@gameanalytics.com> | 2014-02-13 12:44:21 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-02-13 12:46:47 -0800 |
| commit | 5fa53c02fc89af7328a659045c954d72bf0b8664 (patch) | |
| tree | 7f4f837709a688fd91b912a98c152f39fbcb92cc /ec2/spark_ec2.py | |
| parent | a3bb86179e452d348f7e8bd3859befb3ff1f4df1 (diff) | |
| download | spark-5fa53c02fc89af7328a659045c954d72bf0b8664.tar.gz spark-5fa53c02fc89af7328a659045c954d72bf0b8664.tar.bz2 spark-5fa53c02fc89af7328a659045c954d72bf0b8664.zip | |
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.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 19b4bb2b444f1dbc4592bf3d58b17652e0ae6d6b)
Signed-off-by: Patrick Wendell <pwendell@gmail.com>
Diffstat (limited to 'ec2/spark_ec2.py')
| -rwxr-xr-x | ec2/spark_ec2.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index e7cb5ab3ff..eea63fea2a 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] |