aboutsummaryrefslogtreecommitdiff
path: root/ec2
diff options
context:
space:
mode:
authorPatrick Wendell <pwendell@gmail.com>2013-07-11 15:44:31 -0700
committerPatrick Wendell <pwendell@gmail.com>2013-07-11 15:44:31 -0700
commitf1689185d612fbdcc3234b15eb85e1cc909a0fb1 (patch)
tree749dca6f51e9786ae51602c50634cba85ccd8f01 /ec2
parent311e63f2c7eb570c83184fa6698461ffd3b08971 (diff)
downloadspark-f1689185d612fbdcc3234b15eb85e1cc909a0fb1.tar.gz
spark-f1689185d612fbdcc3234b15eb85e1cc909a0fb1.tar.bz2
spark-f1689185d612fbdcc3234b15eb85e1cc909a0fb1.zip
Adding ability to custom deploy only Spark
Diffstat (limited to 'ec2')
-rwxr-xr-xec2/spark_ec2.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py
index d8890f26f4..dd75c49abe 100755
--- a/ec2/spark_ec2.py
+++ b/ec2/spark_ec2.py
@@ -495,8 +495,15 @@ def deploy_files(conn, root_dir, opts, master_nodes, slave_nodes, modules):
cluster_url = "%s:7077" % active_master
if "." in opts.spark_version:
+ # Pre-built deploy
(spark_v, shark_v) = get_spark_shark_version(opts)
+ else if opts.shark_version is None:
+ # Spark-only custom deploy
+ spark_v = "%s|%s" % (opts.spark_git_repo, opts.spark_version)
+ shark_v = ""
+ modules = filter(lambda x: x != "shark", modules)
else:
+ # Spark and Shark custom deploy
spark_v = "%s|%s" % (opts.spark_git_repo, opts.spark_version)
shark_v = "%s|%s" % (opts.shark_git_repo, opts.shark_version)