aboutsummaryrefslogtreecommitdiff
path: root/ec2
diff options
context:
space:
mode:
authorBasit Mustafa <basitmustafa@computes-things-for-basit.local>2014-07-18 12:23:47 -0700
committerPatrick Wendell <pwendell@gmail.com>2014-07-18 12:23:47 -0700
commit7f87ab98138d00723e007471f1a7f506650978cb (patch)
treef0acd94219d04e9a5ede72b255feb4157c55c1e3 /ec2
parent30b8d369d459be5da133f12ebb33a9c74579f468 (diff)
downloadspark-7f87ab98138d00723e007471f1a7f506650978cb.tar.gz
spark-7f87ab98138d00723e007471f1a7f506650978cb.tar.bz2
spark-7f87ab98138d00723e007471f1a7f506650978cb.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
Diffstat (limited to 'ec2')
-rwxr-xr-xec2/spark_ec2.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py
index 44775ea479..02cfe4ec39 100755
--- a/ec2/spark_ec2.py
+++ b/ec2/spark_ec2.py
@@ -240,7 +240,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]