diff options
| author | cheng chang <myairia@gmail.com> | 2015-03-10 11:02:12 +0000 |
|---|---|---|
| committer | Sean Owen <sowen@cloudera.com> | 2015-03-10 11:02:54 +0000 |
| commit | 7c7d2d5e093b0623edc75dd166ec1179b4e62062 (patch) | |
| tree | 88b370cc6b5b6edb854dd7fd44571bfa91618927 /ec2/deploy.generic/root | |
| parent | d14df06c05a6228fd6522914c39aa75898eddfc1 (diff) | |
| download | spark-7c7d2d5e093b0623edc75dd166ec1179b4e62062.tar.gz spark-7c7d2d5e093b0623edc75dd166ec1179b4e62062.tar.bz2 spark-7c7d2d5e093b0623edc75dd166ec1179b4e62062.zip | |
[SPARK-6186] [EC2] Make Tachyon version configurable in EC2 deployment script
This PR comes from Tachyon community to solve the issue:
https://tachyon.atlassian.net/browse/TACHYON-11
An accompanying PR is in mesos/spark-ec2:
https://github.com/mesos/spark-ec2/pull/101
Author: cheng chang <myairia@gmail.com>
Closes #4901 from uronce-cc/master and squashes the following commits:
313aa36 [cheng chang] minor re-wording
fd2a48e [cheng chang] Remove Tachyon when deploying through git hash
1d53c5c [cheng chang] add default value to --tachyon-version
6f8887e [cheng chang] make tachyon version configurable
Diffstat (limited to 'ec2/deploy.generic/root')
| -rw-r--r-- | ec2/deploy.generic/root/spark-ec2/ec2-variables.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ec2/deploy.generic/root/spark-ec2/ec2-variables.sh b/ec2/deploy.generic/root/spark-ec2/ec2-variables.sh index 740c267fd9..0857657152 100644 --- a/ec2/deploy.generic/root/spark-ec2/ec2-variables.sh +++ b/ec2/deploy.generic/root/spark-ec2/ec2-variables.sh @@ -26,9 +26,10 @@ export SPARK_LOCAL_DIRS="{{spark_local_dirs}}" export MODULES="{{modules}}" export SPARK_VERSION="{{spark_version}}" export SHARK_VERSION="{{shark_version}}" +export TACHYON_VERSION="{{tachyon_version}}" export HADOOP_MAJOR_VERSION="{{hadoop_major_version}}" export SWAP_MB="{{swap}}" export SPARK_WORKER_INSTANCES="{{spark_worker_instances}}" export SPARK_MASTER_OPTS="{{spark_master_opts}}" export AWS_ACCESS_KEY_ID="{{aws_access_key_id}}" -export AWS_SECRET_ACCESS_KEY="{{aws_secret_access_key}}"
\ No newline at end of file +export AWS_SECRET_ACCESS_KEY="{{aws_secret_access_key}}" |