aboutsummaryrefslogtreecommitdiff
path: root/bigtop-deploy
diff options
context:
space:
mode:
authorMichael Weiser <m.weiser@science-computing.de>2015-02-19 16:10:49 +0100
committerOlaf Flebbe <of@oflebbe.de>2015-04-28 22:04:59 +0200
commitb0393b58aa1f4682e25da5ad2d76f35fafe3a969 (patch)
treeb7d18544f150e582421c6df18c550f979e34df74 /bigtop-deploy
parent05abe61cb1a44488b58c82bf898aea43d570bcbb (diff)
BIGTOP-1683: puppet hadoop-env.sh: Add option to configure tez environment
This patch adds the option to class common of puppet module hadoop to set environment variables required for tez. Signed-off-by: Olaf Flebbe <of@oflebbe.de>
Diffstat (limited to 'bigtop-deploy')
-rw-r--r--bigtop-deploy/puppet/modules/hadoop/manifests/init.pp2
-rw-r--r--bigtop-deploy/puppet/modules/hadoop/templates/hadoop-env.sh4
2 files changed, 6 insertions, 0 deletions
diff --git a/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp b/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
index b0a7b0e1..98e3d2c8 100644
--- a/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
+++ b/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
@@ -44,6 +44,8 @@ class hadoop ($hadoop_security_authentication = "simple",
$hadoop_pid_dir = undef,
$hadoop_ident_string = undef,
$hadoop_niceness = undef,
+ $tez_conf_dir = undef,
+ $tez_jars = undef,
) inherits hadoop {
file {
diff --git a/bigtop-deploy/puppet/modules/hadoop/templates/hadoop-env.sh b/bigtop-deploy/puppet/modules/hadoop/templates/hadoop-env.sh
index d460c324..318589f5 100644
--- a/bigtop-deploy/puppet/modules/hadoop/templates/hadoop-env.sh
+++ b/bigtop-deploy/puppet/modules/hadoop/templates/hadoop-env.sh
@@ -34,6 +34,10 @@
# The java implementation to use. Required.
<%= shell_config("JAVA_HOME", "hadoop_java_home") %>
+# tez environment, needed to enable tez
+<%= shell_config("TEZ_CONF_DIR") %>
+<%= shell_config("TEZ_JARS") %>
+
# Extra Java CLASSPATH elements. Optional.
<%= shell_config("HADOOP_CLASSPATH") %>