浏览代码

AMBARI-2665. Zookeeper throws an stacktrace on Ambari secure cluster. Missing changes. (swagle)

Siddharth Wagle 12 年之前
父节点
当前提交
35523fca93

+ 3 - 2
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'],