aboutsummaryrefslogtreecommitdiff
path: root/ec2/deploy.generic
diff options
context:
space:
mode:
authorDan Osipov <daniil.osipov@shazam.com>2014-09-16 13:40:16 -0700
committerPatrick Wendell <pwendell@gmail.com>2014-09-16 13:40:16 -0700
commitb20171267d610715d5b0a86b474c903e9bc3a1a3 (patch)
treecc5b31cb62a4764412a4aa8569fa05a9875b49f3 /ec2/deploy.generic
parentec1adecbb72d291d7ef122fb0505bae53116e0e6 (diff)
downloadspark-b20171267d610715d5b0a86b474c903e9bc3a1a3.tar.gz
spark-b20171267d610715d5b0a86b474c903e9bc3a1a3.tar.bz2
spark-b20171267d610715d5b0a86b474c903e9bc3a1a3.zip
[SPARK-787] Add S3 configuration parameters to the EC2 deploy scripts
When deploying to AWS, there is additional configuration that is required to read S3 files. EMR creates it automatically, there is no reason that the Spark EC2 script shouldn't. This PR requires a corresponding PR to the mesos/spark-ec2 to be merged, as it gets cloned in the process of setting up machines: https://github.com/mesos/spark-ec2/pull/58 Author: Dan Osipov <daniil.osipov@shazam.com> Closes #1120 from danosipov/s3_credentials and squashes the following commits: 758da8b [Dan Osipov] Modify documentation to include the new parameter 71fab14 [Dan Osipov] Use a parameter --copy-aws-credentials to enable S3 credential deployment 7e0da26 [Dan Osipov] Get AWS credentials out of boto connection instance 39bdf30 [Dan Osipov] Add S3 configuration parameters to the EC2 deploy scripts
Diffstat (limited to 'ec2/deploy.generic')
-rw-r--r--ec2/deploy.generic/root/spark-ec2/ec2-variables.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/ec2/deploy.generic/root/spark-ec2/ec2-variables.sh b/ec2/deploy.generic/root/spark-ec2/ec2-variables.sh
index 3570891be8..740c267fd9 100644
--- a/ec2/deploy.generic/root/spark-ec2/ec2-variables.sh
+++ b/ec2/deploy.generic/root/spark-ec2/ec2-variables.sh
@@ -30,3 +30,5 @@ 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