diff options
author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-02-17 16:53:12 -0800 |
---|---|---|
committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-02-17 16:53:12 -0800 |
commit | 455d015076ab1fcafa99484c8dcf7cc9d740686a (patch) | |
tree | 555835066499cf3ae15dbf228077382809ac92a5 | |
parent | 08e444df0e8afec1bcae45ad1edcaff1fc21b39e (diff) | |
download | spark-455d015076ab1fcafa99484c8dcf7cc9d740686a.tar.gz spark-455d015076ab1fcafa99484c8dcf7cc9d740686a.tar.bz2 spark-455d015076ab1fcafa99484c8dcf7cc9d740686a.zip |
Clean up EC2 script options a bit
-rwxr-xr-x | ec2/spark_ec2.py | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index cb8f78db8d..7967bcac50 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -82,18 +82,21 @@ def parse_args(): parser.add_option("--spot-price", metavar="PRICE", type="float", help="If specified, launch slaves as spot instances with the given " + "maximum price (in dollars)") - parser.add_option("-c", "--cluster-type", default="mesos", - help="'mesos' for a mesos cluster, 'standalone' for a standalone spark cluster (default: mesos)") - parser.add_option("-g", "--ganglia", action="store_true", default=True, - help="Setup ganglia monitoring for the cluster. NOTE: The ganglia " + - "monitoring page will be publicly accessible") + parser.add_option("--cluster-type", type="choice", metavar="TYPE", + choices=["mesos", "standalone"], default="mesos", + help="'mesos' for a Mesos cluster, 'standalone' for a standalone " + + "Spark cluster (default: mesos)") + parser.add_option("--ganglia", action="store_true", default=True, + help="Setup Ganglia monitoring on cluster (default: on). NOTE: " + + "the Ganglia page will be publicly accessible") + parser.add_option("--no-ganglia", action="store_false", dest="ganglia", + help="Disable Ganglia monitoring for the cluster") parser.add_option("--new-scripts", action="store_true", default=False, - help="Use new spark-ec2 scripts to setup the cluster. NOTE: Ganglia " + - "will not be setup with this option") + help="Use new spark-ec2 scripts, for Spark >= 0.7 AMIs") parser.add_option("-u", "--user", default="root", - help="The ssh user you want to connect as (default: root)") + help="The SSH user you want to connect as (default: root)") parser.add_option("--delete-groups", action="store_true", default=False, - help="When destroying a cluster, also destroy the security groups that were created") + help="When destroying a cluster, delete the security groups that were created") (opts, args) = parser.parse_args() if len(args) != 2: |