svn commit: r1458501 - in /incubator/ambari/trunk: CHANGES.txt ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/params.pp

[sw...@apache.org]

Author: swagle
Date: Tue Mar 19 20:32:43 2013
New Revision: 1458501

URL: http://svn.apache.org/r1458501
Log:
AMBARI-1666. Oozie properties for principal and keytab not read from oozie-site. (swagle)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/params.pp

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1458501&r1=1458500&r2=1458501&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue Mar 19 20:32:43 2013
@@ -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)
 

Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/params.pp?rev=1458501&r1=1458500&r2=1458501&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/params.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/params.pp Tue Mar 19 20:32:43 2013
@@ -47,8 +47,8 @@ class hdp-oozie::params() inherits hdp::
   
   ### 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"