diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2012-08-28 22:40:00 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2012-08-28 22:40:00 -0700 |
| commit | 47507d69d98b47685d667d7ec52dcc4116465eb1 (patch) | |
| tree | 00065f18574018e79018d2b50b67d749a91c0f1a /ec2 | |
| parent | bf2e9cb08ea236a776e21721c8b1929901cdeff1 (diff) | |
| download | spark-47507d69d98b47685d667d7ec52dcc4116465eb1.tar.gz spark-47507d69d98b47685d667d7ec52dcc4116465eb1.tar.bz2 spark-47507d69d98b47685d667d7ec52dcc4116465eb1.zip | |
Made region used by spark-ec2 configurable.
Diffstat (limited to 'ec2')
| -rwxr-xr-x | ec2/spark_ec2.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 931e4068de..ddd3d5aa6d 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -59,7 +59,9 @@ def parse_args(): "WARNING: must be 64-bit; small instances won't work") parser.add_option("-m", "--master-instance-type", default="", help="Master instance type (leave empty for same as instance-type)") - parser.add_option("-z", "--zone", default="us-east-1b", + parser.add_option("-r", "--region", default="us-east-1", + help="EC2 region zone to launch instances in") + parser.add_option("-z", "--zone", default="", help="Availability zone to launch instances in") parser.add_option("-a", "--ami", default="latest", help="Amazon Machine Image ID to use, or 'latest' to use latest " + @@ -470,7 +472,7 @@ def ssh(host, opts, command): def main(): (opts, action, cluster_name) = parse_args() - conn = boto.connect_ec2() + conn = boto.ec2.connect_to_region(opts.region) # Select an AZ at random if it was not specified. if opts.zone == "": |