diff options
| author | Tathagata Das <tathagata.das1565@gmail.com> | 2014-01-11 23:40:57 -0800 |
|---|---|---|
| committer | Tathagata Das <tathagata.das1565@gmail.com> | 2014-01-11 23:40:57 -0800 |
| commit | 18f4889d96b61b59569ec05f64900da1477404d0 (patch) | |
| tree | 3dcb95406babf79d7234aa3851366d5b162dde72 /ec2 | |
| parent | 4d9b0ab420df383869fa586b229ac00f234b8749 (diff) | |
| parent | 288a878999848adb130041d1e40c14bfc879cec6 (diff) | |
| download | spark-18f4889d96b61b59569ec05f64900da1477404d0.tar.gz spark-18f4889d96b61b59569ec05f64900da1477404d0.tar.bz2 spark-18f4889d96b61b59569ec05f64900da1477404d0.zip | |
Merge remote-tracking branch 'apache/master' into error-handling
Diffstat (limited to 'ec2')
| -rwxr-xr-x | ec2/spark_ec2.py | 12 |
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] |