Repository: spark Updated Branches: refs/heads/branch-1.0 d35837a3a -> 284bf1054
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 Conflicts: ec2/spark_ec2.py Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/284bf105 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/284bf105 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/284bf105 Branch: refs/heads/branch-1.0 Commit: 284bf1054f10d2e3072097711902764da7589037 Parents: d35837a Author: Basit Mustafa <[email protected]> Authored: Fri Jul 18 12:23:47 2014 -0700 Committer: Patrick Wendell <[email protected]> Committed: Fri Jul 18 12:25:59 2014 -0700 ---------------------------------------------------------------------- ec2/spark_ec2.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/284bf105/ec2/spark_ec2.py ---------------------------------------------------------------------- diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index ec3d144..83fe920 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]
