From 976e02491e3c0417c416d85b1f9e4f1c52b0200d Mon Sep 17 00:00:00 2001
From: Patrick Wendell <pwendell@gmail.com>
Date: Wed, 8 May 2013 17:18:21 -0700
Subject: [PATCH] Resolve AMI region automatically
---
ec2/spark_ec2.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py
index e917fc8dc4..82ad98fbb3 100755
--- a/ec2/spark_ec2.py
+++ b/ec2/spark_ec2.py
@@ -189,12 +189,14 @@ def get_spark_ami(opts):
if version_prefix != "latest":
print >> stderr, \
"Don't know how to resolve AMI for version: %s" % version_prefix
- ami_path = "%s/%s/%s/%s" % (AMI_PREFIX, version_prefix, "us-east", instance_type)
+
+ region = "-".join(opts.region.split("-")[:2])
+ ami_path = "%s/%s/%s/%s" % (AMI_PREFIX, version_prefix, region, instance_type)
try:
ami = urllib2.urlopen(ami_path).read().strip()
print "Spark AMI: " + ami
except:
- print >> stderr, "Could not read " + ami_path
+ print >> stderr, "Could not resolve AMI at: " + ami_path
sys.exit(1)
return ami
--
GitLab