Author: jaimin
Date: Thu Mar 28 15:58:49 2013
New Revision: 1462176
URL: http://svn.apache.org/r1462176
Log:
AMBARI-1732. Oozie service check fails in secure cluster. (jaimin)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/init.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/service.pp
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1462176&r1=1462175&r2=1462176&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu Mar 28 15:58:49 2013
@@ -532,6 +532,8 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-1732. Oozie service check fails in secure cluster. (jaimin)
+
AMBARI 1733. Add service/component specific upgrade puppet files. (smohanty)
AMBARI-1731. WebHcat smoke test fails for the secure cluster. (jaimin)
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/init.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/init.pp?rev=1462176&r1=1462175&r2=1462176&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/init.pp
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/init.pp
Thu Mar 28 15:58:49 2013
@@ -41,7 +41,10 @@ class hdp-oozie(
group => $hdp::params::user_group,
mode => '0660'
}
+ $oozie-site = $configuration['oozie-site']
+ $oozie_principal =
$oozie-site["oozie.service.HadoopAccessorService.kerberos.principal"]
}
+
if ($service_state == 'uninstalled') {
hdp::package { 'oozie-client' :
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/service.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/service.pp?rev=1462176&r1=1462175&r2=1462176&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/service.pp
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/service.pp
Thu Mar 28 15:58:49 2013
@@ -37,7 +37,7 @@ class hdp-oozie::service(
$security = $hdp::params::security_enabled
$oozie_keytab = $hdp-oozie::params::oozie_service_keytab
- $oozie_principal = $hdp-oozie::params::oozie_principal
+ $oozie_principal = $hdp-oozie::oozie_principal
if ($security == true) {
$kinit_if_needed = "${hdp::params::kinit_path_local} -kt ${oozie_keytab}
${oozie_principal}"
