Updated Branches: refs/heads/trunk 558d5fb64 -> 553bf73d1
AMBARI-3088: Enable Security wizard: Datanode start fails on HDP1.x stack. (jaimin) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/553bf73d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/553bf73d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/553bf73d Branch: refs/heads/trunk Commit: 553bf73d1767d70f392e99fc68cb5187ad706bf6 Parents: 558d5fb Author: Jaimin Jetly <[email protected]> Authored: Tue Sep 3 18:03:51 2013 -0700 Committer: Jaimin Jetly <[email protected]> Committed: Tue Sep 3 18:04:11 2013 -0700 ---------------------------------------------------------------------- .../hdp-hadoop/templates/hadoop-env.sh.erb | 3 +++ .../main/puppet/modules/hdp/manifests/params.pp | 28 +++++++++++--------- 2 files changed, 18 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/553bf73d/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-env.sh.erb ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-env.sh.erb b/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-env.sh.erb index 14efb6c..bd7f5f7 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-env.sh.erb +++ b/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-env.sh.erb @@ -31,8 +31,11 @@ export HADOOP_HOME_WARN_SUPPRESS=1 #TODO: if env var set that can cause problems export HADOOP_CONF_DIR=${HADOOP_CONF_DIR:-<%=scope.function_hdp_template_var("conf_dir")%>} +<% if scope.function_hdp_template_var("::hdp::params::isHadoop2Stack") == true %> # Path to jsvc required by secure HDP 2.0 datanode export JSVC_HOME=<%=scope.function_hdp_template_var("jsvc_path")%> +<% end %> + # The maximum amount of heap to use, in MB. Default is 1000. export HADOOP_HEAPSIZE="<%=scope.function_hdp_template_var("hadoop_heapsize")%>" http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/553bf73d/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp b/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp index c70c847..0b11b87 100644 --- a/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp +++ b/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp @@ -39,6 +39,14 @@ class hdp::params() $yarn-site = $configuration['yarn-site'] } + ## Stack version + $stack_version = hdp_default("stack_version", "1.3.0") + if (hdp_get_major_stack_version($hdp::params::stack_version) >= 2) { + $isHadoop2Stack = true + } else { + $isHadoop2Stack = false + } + ##### global state defaults #### $cluster_service_state = hdp_default("cluster_service_state","running") $cluster_client_state = hdp_default("cluster_client_state","installed_and_configured") @@ -54,7 +62,7 @@ class hdp::params() 'kerberos' => true, default => false, } - + $kerberos_domain = hdp_default("kerberos_domain","EXAMPLE.COM") $kinit_path_local = hdp_get_kinit_path(hdp_default("kinit_path_local"), "/usr/bin", "/usr/kerberos/bin", "/usr/sbin") $keytab_path = hdp_default("keytab_path", "/etc/security/keytabs") @@ -72,6 +80,12 @@ class hdp::params() $slave_hosts = hdp_default("slave_hosts") $journalnode_hosts = hdp_default("journalnode_hosts") $zkfc_hosts = hdp_default("zkfc_hosts") + $rm_host = hdp_default("rm_host") + $nm_hosts = hdp_default("nm_hosts") + $hs_host = hdp_default("hs_host") + $zookeeper_hosts = hdp_default("zookeeper_hosts") + $flume_hosts = hdp_default("flume_hosts") + $nn_principal_str = hdp_default("hdfs-site/dfs.namenode.kerberos.principal", "nn/[email protected]") if ("_HOST" in $nn_principal_str and hdp_is_empty($namenode_host) == false) { @@ -86,14 +100,6 @@ class hdp::params() $jt_principal = $jt_principal_str } - $rm_host = hdp_default("rm_host") - $nm_hosts = hdp_default("nm_hosts") - $hs_host = hdp_default("hs_host") - - $zookeeper_hosts = hdp_default("zookeeper_hosts") - - $flume_hosts = hdp_default("flume_hosts") - $flume_port = hdp_default("flume_port", "4159") $hbase_master_hosts = hdp_default("hbase_master_hosts", "") @@ -119,10 +125,6 @@ class hdp::params() $hdp_os = $::operatingsystem $hdp_os_version = $::operatingsystemrelease - - - ## Stack version - $stack_version = hdp_default("stack_version", "1.3.0") case $::operatingsystem {
