diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2013-06-13 10:30:59 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2013-06-13 10:30:59 -0700 |
| commit | d5f74aa9b7d806e2d189f20dcf1b619653507650 (patch) | |
| tree | 6c0167776c526367542551bcd05c3666f043d9ae /ec2 | |
| parent | eae7590d0d7c3093bcedefdf2ec4f75d7a8c62b8 (diff) | |
| download | spark-d5f74aa9b7d806e2d189f20dcf1b619653507650.tar.gz spark-d5f74aa9b7d806e2d189f20dcf1b619653507650.tar.bz2 spark-d5f74aa9b7d806e2d189f20dcf1b619653507650.zip | |
Cleanup of AMI tag
Diffstat (limited to 'ec2')
| -rwxr-xr-x | ec2/spark_ec2.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 7d2de3e7d2..0b4dc2077e 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -63,8 +63,8 @@ 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", - help="Amazon Machine Image ID to use (default: latest)") + parser.add_option("-a", "--ami", + help="Amazon Machine Image ID to use") parser.add_option("-v", "--spark-version", default="0.7.2", help="Version of Spark to use: 'X.Y.Z' or a specific git hash") @@ -180,7 +180,6 @@ def get_spark_shark_version(opts): # Attempt to resolve an appropriate AMI given the architecture and # region of the request. def get_spark_ami(opts): - version = opts.ami instance_types = { "m1.small": "pvm", "m1.medium": "pvm", @@ -269,7 +268,7 @@ def launch_cluster(conn, opts, cluster_name): sys.exit(1) # Figure out Spark AMI - if "ami" not in opts.ami: + if opts.ami is None: opts.ami = get_spark_ami(opts) print "Launching instances..." |