svn commit: r1461909 - in /incubator/ambari/trunk: CHANGES.txt ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/server.pp

[ja...@apache.org]

Author: jaimin
Date: Thu Mar 28 00:32:52 2013
New Revision: 1461909

URL: http://svn.apache.org/r1461909
Log:
AMBARI-1731. WebHcat smoke test fails for the secure cluster

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

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1461909&r1=1461908&r2=1461909&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu Mar 28 00:32:52 2013
@@ -532,6 +532,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1731. WebHcat smoke test fails for the secure cluster. (jaimin)
+
  AMBARI-1730. Hive Service check fails in non secure cluster. (jaimin)
 
  AMBARI-1724. Agent has it hard-coded that HDP repo file can only be 

Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/server.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/server.pp?rev=1461909&r1=1461908&r2=1461909&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/server.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/server.pp Thu Mar 28 00:32:52 2013
@@ -25,7 +25,7 @@ class hdp-templeton::server(
 {  
 
   $templeton_user = $hdp-templeton::params::templeton_user
-
+  $smoke_test_user = $hdp::params::smokeuser
   if ($service_state == 'no_op') { 
   } elsif ($service_state in ['running','stopped','installed_and_configured','uninstalled']) {
   $hdp::params::service_exists['hdp-templeton::server'] = true
@@ -56,7 +56,7 @@ class hdp-templeton::server(
   }
 
   if ($security_enabled == true) {
-    $kinit_if_needed = "${hdp::params::kinit_path_local} -kt ${hdp::params::keytab_path}/${templeton_user}.headless.keytab ${templeton_user};"
+    $kinit_if_needed = "${hdp::params::kinit_path_local} -kt ${hdp::params::keytab_path}/${smoke_test_user}.headless.keytab ${smoke_test_user};"
   } else {
     $kinit_if_needed = "echo 0;"
   }