From 11ded3f66f178e4d8d2b23491dd5e0ea23bcf719 Mon Sep 17 00:00:00 2001
From: Varakhedi Sujeet <svarakhedi@gopivotal.com>
Date: Wed, 4 Jun 2014 16:01:56 -0700
Subject: [PATCH] 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
---
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 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]
--
GitLab