diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2013-05-08 21:42:08 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2013-05-08 21:46:01 -0700 |
| commit | f6c965a98b2852d4f9b3cb3c00216cf750ff9738 (patch) | |
| tree | a92265be7e5d17a4a6eb651a36dcbe5038c97322 /ec2/spark_ec2.py | |
| parent | 976e02491e3c0417c416d85b1f9e4f1c52b0200d (diff) | |
| download | spark-f6c965a98b2852d4f9b3cb3c00216cf750ff9738.tar.gz spark-f6c965a98b2852d4f9b3cb3c00216cf750ff9738.tar.bz2 spark-f6c965a98b2852d4f9b3cb3c00216cf750ff9738.zip | |
Changing spark version and availability zone fix
Diffstat (limited to 'ec2/spark_ec2.py')
| -rwxr-xr-x | ec2/spark_ec2.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 82ad98fbb3..c45e08809f 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -64,7 +64,7 @@ def parse_args(): help="Availability zone to launch instances in, or 'all' to spread " + "slaves across multiple (an additional $0.01/Gb for bandwidth" + "between zones applies)") - parser.add_option("-a", "--ami", default="latest", + parser.add_option("-a", "--ami", default="0.7.0", help="Amazon Machine Image ID to use, or 'latest' to use latest " + "available AMI (default: latest)") parser.add_option("-D", metavar="[ADDRESS:]PORT", dest="proxy_port", @@ -190,7 +190,8 @@ def get_spark_ami(opts): print >> stderr, \ "Don't know how to resolve AMI for version: %s" % version_prefix - region = "-".join(opts.region.split("-")[:2]) + parts = opts.region.split("-") + region = "-".join(parts[0], parts[1], parts[2][0]) # strip any avail. zone ami_path = "%s/%s/%s/%s" % (AMI_PREFIX, version_prefix, region, instance_type) try: ami = urllib2.urlopen(ami_path).read().strip() |