From 08e444df0e8afec1bcae45ad1edcaff1fc21b39e Mon Sep 17 00:00:00 2001 From: Matei Zaharia Date: Sun, 17 Feb 2013 14:01:48 -0800 Subject: Change EC2 script to use 0.6 AMIs by default, for now --- ec2/spark_ec2.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ec2/spark_ec2.py') diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index ce1072fd39..cb8f78db8d 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -87,8 +87,8 @@ def parse_args(): 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("--mesos-scripts", action="store_true", default=False, - help="Use older mesos-ec2 scripts to setup the cluster. NOTE: Ganglia " + + 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") parser.add_option("-u", "--user", default="root", help="The ssh user you want to connect as (default: root)") @@ -380,17 +380,17 @@ def setup_cluster(conn, master_nodes, slave_nodes, zoo_nodes, opts, deploy_ssh_k if opts.ganglia: modules.append('ganglia') - if not opts.mesos_scripts: + if opts.new_scripts: # NOTE: We should clone the repository before running deploy_files to # prevent ec2-variables.sh from being overwritten - ssh(master, opts, "rm -rf spark-ec2 && git clone https://github.com/shivaram/spark-ec2.git") + ssh(master, opts, "rm -rf spark-ec2 && git clone https://github.com/mesos/spark-ec2.git") print "Deploying files to master..." deploy_files(conn, "deploy.generic", opts, master_nodes, slave_nodes, zoo_nodes, modules) print "Running setup on master..." - if opts.mesos_scripts: + if not opts.new_scripts: if opts.cluster_type == "mesos": setup_mesos_cluster(master, opts) elif opts.cluster_type == "standalone": -- cgit v1.2.3