diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 0b85bbd46f377aadaad5e272509a4020c5b00f55..8879da4b612b420035765ee7e36e3ac56f1107ec 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -58,7 +58,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 " + @@ -438,7 +440,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 == "":