aboutsummaryrefslogtreecommitdiff
path: root/ec2
diff options
context:
space:
mode:
authorShivaram Venkataraman <shivaram@eecs.berkeley.edu>2014-01-10 12:44:55 -0800
committerShivaram Venkataraman <shivaram@eecs.berkeley.edu>2014-01-10 12:44:55 -0800
commit7c4e6e1bf1dbe38270f5f4d1f3ca08c0be242553 (patch)
tree8b1ccf847d9bd6706442e79f8eebebd23b0334b7 /ec2
parent0ebc97305a0e23a9d2183c335998c800c5d865b7 (diff)
downloadspark-7c4e6e1bf1dbe38270f5f4d1f3ca08c0be242553.tar.gz
spark-7c4e6e1bf1dbe38270f5f4d1f3ca08c0be242553.tar.bz2
spark-7c4e6e1bf1dbe38270f5f4d1f3ca08c0be242553.zip
Add i2 instance types to Spark EC2.
Diffstat (limited to 'ec2')
-rwxr-xr-xec2/spark_ec2.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py
index d82a1e1490..e7cb5ab3ff 100755
--- a/ec2/spark_ec2.py
+++ b/ec2/spark_ec2.py
@@ -185,7 +185,11 @@ def get_spark_ami(opts):
"hi1.4xlarge": "hvm",
"m3.xlarge": "hvm",
"m3.2xlarge": "hvm",
- "cr1.8xlarge": "hvm"
+ "cr1.8xlarge": "hvm",
+ "i2.xlarge": "hvm",
+ "i2.2xlarge": "hvm",
+ "i2.4xlarge": "hvm",
+ "i2.8xlarge": "hvm"
}
if opts.instance_type in instance_types:
instance_type = instance_types[opts.instance_type]
@@ -478,7 +482,11 @@ def get_num_disks(instance_type):
"cr1.8xlarge": 2,
"hi1.4xlarge": 2,
"m3.xlarge": 0,
- "m3.2xlarge": 0
+ "m3.2xlarge": 0,
+ "i2.xlarge": 1,
+ "i2.2xlarge": 2,
+ "i2.4xlarge": 4,
+ "i2.8xlarge": 8
}
if instance_type in disks_by_instance:
return disks_by_instance[instance_type]