incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From swa...@apache.org
Subject [2/2] git commit: AMBARI-2665. Zookeeper throws an stacktrace on Ambari secure cluster. Missing changes. (swagle)
Date Wed, 17 Jul 2013 00:38:27 GMT
AMBARI-2665. Zookeeper throws an stacktrace on Ambari secure cluster. Missing changes. (swagle)


Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/35523fca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/35523fca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/35523fca

Branch: refs/heads/trunk
Commit: 35523fca93182cf73f93d1d179a86e9415a61df6
Parents: a658a77
Author: Siddharth Wagle <swagle@hortonworks.com>
Authored: Tue Jul 16 17:30:05 2013 -0700
Committer: Siddharth Wagle <swagle@hortonworks.com>
Committed: Tue Jul 16 17:30:50 2013 -0700

----------------------------------------------------------------------
 .../modules/hdp-zookeeper/manifests/zookeeper/service_check.pp  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/35523fca/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/zookeeper/service_check.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/zookeeper/service_check.pp
b/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/zookeeper/service_check.pp
index 25760fa..283c6ab 100644
--- a/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/zookeeper/service_check.pp
+++ b/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/zookeeper/service_check.pp
@@ -26,7 +26,8 @@ class hdp-zookeeper::zookeeper::service_check()
   $security_enabled = $hdp::params::security_enabled
   $smoke_test_user = $hdp::params::smokeuser
   $zookeeper_smoke_shell_files = ['zkService.sh']
-
+  $kinit_path = $hdp::params::kinit_path_local
+  $smoke_user_keytab = $hdp::params::smokeuser_keytab
   anchor { 'hdp-zookeeper::zookeeper::service_check::begin':}
 
   hdp-zookeeper::zookeeper_smoke_shell_file { $zookeeper_smoke_shell_files: }
@@ -43,7 +44,7 @@ define hdp-zookeeper::zookeeper_smoke_shell_file()
   }
 
   exec { '/tmp/zkService.sh':
-    command   => "sh /tmp/zkService.sh ${smoke_script} ${smoke_test_user} ${conf_dir}
${security_enabled}",
+    command   => "sh /tmp/zkSmoke.sh ${smoke_script} ${smoke_test_user} ${conf_dir} ${clientPort}
${security_enabled} ${kinit_path} ${smoke_user_keytab}",
     tries     => 3,
     try_sleep => 5,
     require   => File['/tmp/zkService.sh'],


Mime
View raw message