aboutsummaryrefslogtreecommitdiff
path: root/ec2
diff options
context:
space:
mode:
authorAllan Douglas R. de Oliveira <allan@chaordicsystems.com>2014-08-27 12:43:22 -0700
committerPatrick Wendell <pwendell@gmail.com>2014-08-27 12:43:22 -0700
commit5ac4093c9fa29a11e38f884eebb3f5db087de76f (patch)
tree3225690312fcaea27a0070110f2293f2e4e77309 /ec2
parentd8298c46b7bf566d1cd2f7ea9b1b2b2722dcfb17 (diff)
downloadspark-5ac4093c9fa29a11e38f884eebb3f5db087de76f.tar.gz
spark-5ac4093c9fa29a11e38f884eebb3f5db087de76f.tar.bz2
spark-5ac4093c9fa29a11e38f884eebb3f5db087de76f.zip
SPARK-3259 - User data should be given to the master
Author: Allan Douglas R. de Oliveira <allan@chaordicsystems.com> Closes #2162 from douglaz/user_data_master and squashes the following commits: 10d15f6 [Allan Douglas R. de Oliveira] Give user data also to the master
Diffstat (limited to 'ec2')
-rwxr-xr-xec2/spark_ec2.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py
index 77a246fffe..ddd72a0f86 100755
--- a/ec2/spark_ec2.py
+++ b/ec2/spark_ec2.py
@@ -458,7 +458,8 @@ def launch_cluster(conn, opts, cluster_name):
placement=opts.zone,
min_count=1,
max_count=1,
- block_device_map=block_map)
+ block_device_map=block_map,
+ user_data=user_data_content)
master_nodes = master_res.instances
print "Launched master in %s, regid = %s" % (zone, master_res.id)