From 3cb9fd59419fdb2d7994a0d1085acee7e17f8ca0 Mon Sep 17 00:00:00 2001 From: Varakhedi Sujeet Date: Tue, 3 Jun 2014 17:27:05 -0700 Subject: [PATCH] SPARK-1790: Update EC2 scripts to support r3 instance --- ec2/spark_ec2.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 8b056f5ea734..2d7ee4acd1f4 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -230,7 +230,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] @@ -538,7 +543,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]