Repository: spark Updated Branches: refs/heads/branch-1.0 3df55cb69 -> 914d98ecd
SPARK-1790: Update EC2 scripts to support r3 instance types Author: Varakhedi Sujeet <[email protected]> Closes #960 from sujeetv/ec2-r3 and squashes the following commits: 3cb9fd5 [Varakhedi Sujeet] SPARK-1790: Update EC2 scripts to support r3 instance (cherry picked from commit 11ded3f66f178e4d8d2b23491dd5e0ea23bcf719) 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/914d98ec Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/914d98ec Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/914d98ec Branch: refs/heads/branch-1.0 Commit: 914d98ecd5a734710d269a2ab70b804b13c46ea3 Parents: 3df55cb Author: Varakhedi Sujeet <[email protected]> Authored: Wed Jun 4 16:01:56 2014 -0700 Committer: Patrick Wendell <[email protected]> Committed: Wed Jun 4 16:05:00 2014 -0700 ---------------------------------------------------------------------- ec2/spark_ec2.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/914d98ec/ec2/spark_ec2.py ---------------------------------------------------------------------- diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 8ac3241..d2c29d0 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -201,7 +201,12 @@ def get_spark_ami(opts): "c3.xlarge": "pvm", "c3.2xlarge": "pvm", "c3.4xlarge": "pvm", - "c3.8xlarge": "pvm" + "c3.8xlarge": "pvm", + "r3.large": "hvm", + "r3.xlarge": "hvm", + "r3.2xlarge": "hvm", + "r3.4xlarge": "hvm", + "r3.8xlarge": "hvm" } if opts.instance_type in instance_types: instance_type = instance_types[opts.instance_type] @@ -507,7 +512,12 @@ def get_num_disks(instance_type): "c3.xlarge": 2, "c3.2xlarge": 2, "c3.4xlarge": 2, - "c3.8xlarge": 2 + "c3.8xlarge": 2, + "r3.large": 1, + "r3.xlarge": 1, + "r3.2xlarge": 1, + "r3.4xlarge": 1, + "r3.8xlarge": 2 } if instance_type in disks_by_instance: return disks_by_instance[instance_type]
