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
This commit is contained in:
parent
1765c8d0dd
commit
11ded3f66f
|
@ -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]
|
||||
|
|
Loading…
Reference in a new issue