Repository: spark Updated Branches: refs/heads/master 30b8d369d -> 7f87ab981
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 <[email protected]> Closes #1446 from 24601/master and squashes the following commits: 01fe128 [Basit Mustafa] Makin' it pretty 392a95e [Basit Mustafa] Added t2 instance types Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/7f87ab98 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/7f87ab98 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/7f87ab98 Branch: refs/heads/master Commit: 7f87ab98138d00723e007471f1a7f506650978cb Parents: 30b8d36 Author: Basit Mustafa <[email protected]> Authored: Fri Jul 18 12:23:47 2014 -0700 Committer: Patrick Wendell <[email protected]> Committed: Fri Jul 18 12:23:47 2014 -0700 ---------------------------------------------------------------------- ec2/spark_ec2.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/7f87ab98/ec2/spark_ec2.py ---------------------------------------------------------------------- diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 44775ea..02cfe4e 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]
