Elukey has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403701 )
Change subject: Allow to explicitly set the JAVA_HOME environment variable
..
Allow to explicitly set the JAVA_HOME environment variable
Bug: T166248
Change-Id: Ifd3298a00cb788ea1728882c966b099398f7da76
---
M manifests/hadoop.pp
M manifests/hadoop/defaults.pp
M manifests/hive.pp
M manifests/hive/defaults.pp
M manifests/oozie/defaults.pp
M manifests/oozie/server.pp
M templates/hadoop/hadoop-env.sh.erb
M templates/hadoop/yarn-env.sh.erb
M templates/hive/hive-env.sh.erb
M templates/oozie/oozie-env.sh.erb
10 files changed, 26 insertions(+), 3 deletions(-)
Approvals:
Ottomata: Looks good to me, but someone else must approve
Elukey: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/hadoop.pp b/manifests/hadoop.pp
index b6ca051..b74c9bd 100644
--- a/manifests/hadoop.pp
+++ b/manifests/hadoop.pp
@@ -144,6 +144,8 @@
$resourcemanager_hosts = $namenode_hosts,
$zookeeper_hosts =
$::cdh::hadoop::defaults::zookeeper_hosts,
+$java_home =
$::cdh::hadoop::defaults::java_home,
+
$yarn_local_path =
$::cdh::hadoop::defaults::yarn_local_path,
$yarn_logs_path =
$::cdh::hadoop::defaults::yarn_logs_path,
$dfs_block_size =
$::cdh::hadoop::defaults::dfs_block_size,
diff --git a/manifests/hadoop/defaults.pp b/manifests/hadoop/defaults.pp
index e1807b5..32d854e 100644
--- a/manifests/hadoop/defaults.pp
+++ b/manifests/hadoop/defaults.pp
@@ -13,6 +13,8 @@
# provided value of $namenode_hosts in hadoop.pp.
$zookeeper_hosts = undef
+$java_home = undef
+
$yarn_local_path = 'yarn/local'
$yarn_logs_path = 'yarn/logs'
$dfs_block_size = 67108864 # 64MB default
diff --git a/manifests/hive.pp b/manifests/hive.pp
index b80ee3e..711c360 100644
--- a/manifests/hive.pp
+++ b/manifests/hive.pp
@@ -86,6 +86,8 @@
$hive_exec_log4j_template=
$cdh::hive::defaults::hive_exec_log4j_template,
$hive_env_template = $cdh::hive::defaults::hive_env_template,
+$java_home = $cdh::hive::defaults::java_home,
+
$hive_metastore_opts = $cdh::hive::defaults::hive_metastore_opts,
$hive_server_opts= $cdh::hive::defaults::hive_server_opts,
$hive_metastore_jmx_port =
$cdh::hive::defaults::hive_metastore_jmx_port,
diff --git a/manifests/hive/defaults.pp b/manifests/hive/defaults.pp
index 1513b2b..c5023fd 100644
--- a/manifests/hive/defaults.pp
+++ b/manifests/hive/defaults.pp
@@ -49,6 +49,8 @@
$hive_exec_log4j_template= 'cdh/hive/hive-exec-log4j.properties.erb'
$hive_env_template = 'cdh/hive/hive-env.sh.erb'
+$java_home = undef
+
# Jmx ports
$hive_server_jmx_port= 9978
$hive_metastore_jmx_port = 9979
diff --git a/manifests/oozie/defaults.pp b/manifests/oozie/defaults.pp
index e830b43..d705578 100644
--- a/manifests/oozie/defaults.pp
+++ b/manifests/oozie/defaults.pp
@@ -22,6 +22,7 @@
$authorization_service_authorization_enabled = true
$admin_users = ['hdfs']
+$java_home = undef
$jvm_opts= '-Xmx1024m'
$purge_jobs_older_than_days = 90
diff --git a/manifests/oozie/server.pp b/manifests/oozie/server.pp
index 8f5340a..cfe88ad 100644
--- a/manifests/oozie/server.pp
+++ b/manifests/oozie/server.pp
@@ -61,6 +61,7 @@
$authorization_service_authorization_enabled =
$cdh::oozie::defaults::authorization_service_authorization_enabled,
$admin_users =
$cdh::oozie::defaults::admin_users,
+$java_home =
$cdh::oozie::defaults::java_home,
$jvm_opts=
$cdh::oozie::defaults::jvm_opts,
$purge_jobs_older_than_days =
$cdh::oozie::defaults::purge_jobs_older_than_days,
$oozie_site_template =
$cdh::oozie::defaults::oozie_site_template,
diff --git a/templates/hadoop/hadoop-env.sh.erb
b/templates/hadoop/hadoop-env.sh.erb
index 2857f93..c80a38d 100644
--- a/templates/hadoop/hadoop-env.sh.erb
+++ b/templates/hadoop/hadoop-env.sh.erb
@@ -1,5 +1,9 @@
# Note: This file is managed by Puppet.
+<% if @java_home -%>
+export JAVA_HOME=<%= @java_home %>
+<% end -%>
+
# Use YARN for all hadoop commands
export HADOOP_MAPRED_HOME=/usr/lib/hadoop-mapreduce
diff --git a/templates/hadoop/yarn-env.sh.erb b/templates/hadoop/yarn-env.sh.erb
index 127c62d..aa3b209
