AMBARI-3088: Enable Security wizard: Datanode start fails on HDP1.x stack. (jaimin)

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")%>"

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/_HOST@EXAMPLE.COM")
   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 {