AMBARI-1666. Oozie properties for principal and keytab not read from oozie-site. (swagle)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1458501 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -502,6 +502,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1666. Oozie properties for principal and keytab not read from 
+ oozie-site. (swagle)
+
  AMBARI-1660. Server seems to ignore failures if the prior stage has failed 
  before the next iteration of the scheduler. (Sumit Mohanty via swagle)
 

ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/params.pp

@@ -47,8 +47,8 @@ class hdp-oozie::params() inherits hdp::params
   
   ### oozie-site
   $keytab_path = hdp_default("keytab_path","/etc/security/keytabs")
-  $oozie_service_keytab = hdp_default("oozie.service.HadoopAccessorService.keytab.file", "${keytab_path}/oozie.service.keytab")
-  $oozie_principal = hdp_default("oozie.service.HadoopAccessorService.kerberos.principal", "oozie")
+  $oozie_service_keytab = hdp_default("hadoop/oozie-site/oozie.service.HadoopAccessorService.keytab.file", "${keytab_path}/oozie.service.keytab")
+  $oozie_principal = hdp_default("hadoop/oozie-site/oozie.service.HadoopAccessorService.kerberos.principal", "oozie")
 
   if ($security_enabled == true) {
     $oozie_sasl_enabled = "true"