diff options
| author | Varakhedi Sujeet <svarakhedi@gopivotal.com> | 2014-06-04 16:01:56 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-06-04 16:02:23 -0700 |
| commit | 11ded3f66f178e4d8d2b23491dd5e0ea23bcf719 (patch) | |
| tree | e5f1a21ec3b57a43ce98b141f3e4d06fc848d976 /ec2 | |
| parent | 1765c8d0ddf6bb5bc3c21f994456eba04c581de4 (diff) | |
| download | spark-11ded3f66f178e4d8d2b23491dd5e0ea23bcf719.tar.gz spark-11ded3f66f178e4d8d2b23491dd5e0ea23bcf719.tar.bz2 spark-11ded3f66f178e4d8d2b23491dd5e0ea23bcf719.zip | |
SPARK-1790: Update EC2 scripts to support r3 instance types
Author: Varakhedi Sujeet <svarakhedi@gopivotal.com>
Closes #960 from sujeetv/ec2-r3 and squashes the following commits:
3cb9fd5 [Varakhedi Sujeet] SPARK-1790: Update EC2 scripts to support r3 instance
Diffstat (limited to 'ec2')
| -rwxr-xr-x | ec2/spark_ec2.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 3af9f66e17..9d5748ba4b 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] |