You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by of...@apache.org on 2015/04/28 22:05:48 UTC
bigtop git commit: BIGTOP-1683: puppet hadoop-env.sh: Add option to
configure tez environment
Repository: bigtop
Updated Branches:
refs/heads/master 05abe61cb -> b0393b58a
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>
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/b0393b58
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/b0393b58
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/b0393b58
Branch: refs/heads/master
Commit: b0393b58aa1f4682e25da5ad2d76f35fafe3a969
Parents: 05abe61
Author: Michael Weiser <m....@science-computing.de>
Authored: Thu Feb 19 16:10:49 2015 +0100
Committer: Olaf Flebbe <of...@oflebbe.de>
Committed: Tue Apr 28 22:04:59 2015 +0200
----------------------------------------------------------------------
bigtop-deploy/puppet/modules/hadoop/manifests/init.pp | 2 ++
bigtop-deploy/puppet/modules/hadoop/templates/hadoop-env.sh | 4 ++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/b0393b58/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp b/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
index b0a7b0e..98e3d2c 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 {
http://git-wip-us.apache.org/repos/asf/bigtop/blob/b0393b58/bigtop-deploy/puppet/modules/hadoop/templates/hadoop-env.sh
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/hadoop/templates/hadoop-env.sh b/bigtop-deploy/puppet/modules/hadoop/templates/hadoop-env.sh
index d460c32..318589f 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") %>