Skip to content

Commit

Permalink
[EC2] Factor out Mesos spark-ec2 branch
Browse files Browse the repository at this point in the history
We reference a specific branch in two places. This patch makes it one place.

Author: Nicholas Chammas <[email protected]>

Closes apache#3008 from nchammas/mesos-spark-ec2-branch and squashes the following commits:

10a6089 [Nicholas Chammas] factor out mess spark-ec2 branch
  • Loading branch information
nchammas authored and shivaram committed Nov 3, 2014
1 parent 76386e1 commit 2aca97c
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions ec2/spark_ec2.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,9 @@

DEFAULT_SPARK_VERSION = "1.1.0"

MESOS_SPARK_EC2_BRANCH = "v4"
# A URL prefix from which to fetch AMI information
AMI_PREFIX = "https://raw.github.com/mesos/spark-ec2/v2/ami-list"
AMI_PREFIX = "https://raw.github.com/mesos/spark-ec2/{b}/ami-list".format(b=MESOS_SPARK_EC2_BRANCH)


class UsageError(Exception):
Expand Down Expand Up @@ -583,7 +584,13 @@ def setup_cluster(conn, master_nodes, slave_nodes, opts, deploy_ssh_key):

# 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/mesos/spark-ec2.git -b v4")
ssh(
host=master,
opts=opts,
command="rm -rf spark-ec2"
+ " && "
+ "git clone https://github.com/mesos/spark-ec2.git -b {b}".format(b=MESOS_SPARK_EC2_BRANCH)
)

print "Deploying files to master..."
deploy_files(conn, "deploy.generic", opts, master_nodes, slave_nodes, modules)
Expand Down

0 comments on commit 2aca97c

Please sign in to comment.