diff options
| author | Basit Mustafa <basitmustafa@computes-things-for-basit.local> | 2014-07-18 12:23:47 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-07-18 12:25:59 -0700 |
| commit | 284bf1054f10d2e3072097711902764da7589037 (patch) | |
| tree | 3963d810056e724ae6b34cfa2581eb25a0dc9505 /ec2 | |
| parent | d35837a3a5370afa0abd204f8b4c9d5b9b2aeec0 (diff) | |
| download | spark-284bf1054f10d2e3072097711902764da7589037.tar.gz spark-284bf1054f10d2e3072097711902764da7589037.tar.bz2 spark-284bf1054f10d2e3072097711902764da7589037.zip | |
Added t2 instance types
New t2 instance types require HVM amis, bailout assumption of pvm
causes failures when using t2 instance types.
Author: Basit Mustafa <basitmustafa@computes-things-for-basit.local>
Closes #1446 from 24601/master and squashes the following commits:
01fe128 [Basit Mustafa] Makin' it pretty
392a95e [Basit Mustafa] Added t2 instance types
Conflicts:
ec2/spark_ec2.py
Diffstat (limited to 'ec2')
| -rwxr-xr-x | ec2/spark_ec2.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index ec3d1446e2..83fe9209de 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -210,7 +210,10 @@ def get_spark_ami(opts): "r3.xlarge": "hvm", "r3.2xlarge": "hvm", "r3.4xlarge": "hvm", - "r3.8xlarge": "hvm" + "r3.8xlarge": "hvm", + "t2.micro": "hvm", + "t2.small": "hvm", + "t2.medium": "hvm" } if opts.instance_type in instance_types: instance_type = instance_types[opts.instance_type] |