AMBARI-2522. Zookeeper smoke test failing in secure cluster. (swagle)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1498048 13f79535-47bb-0310-9956-ffa450edef68

ambari-agent/src/main/puppet/modules/hdp-zookeeper/files/zkSmoke.sh

@@ -23,10 +23,15 @@
 smoke_script=$1
 smoke_user=$2
 conf_dir=$3
+security_enabled=$4
 export ZOOKEEPER_EXIT_CODE=0
 zkhosts=` grep "^server\.[[:digit:]]"  $conf_dir/zoo.cfg  | cut -f 2 -d '=' | cut -f 1 -d ':' | tr '\n' ' ' `
 zk_node1=`echo $zkhosts | tr ' ' '\n' | head -n 1`  
 echo "zk_node1=$zk_node1"
+# If security is enabled, destroy the tickets
+if [[ $security_enabled == "true" ]]; then
+  su - $smoke_user -c 'kdestroy'
+fi
 # Delete /zk_smoketest znode if exists
 su - $smoke_user -c "source $conf_dir/zookeeper-env.sh ;  echo delete /zk_smoketest | ${smoke_script} -server $zk_node1:2181"  
 # Create /zk_smoketest znode on one zookeeper server
@@ -45,7 +50,7 @@ for i in $zkhosts ; do
   fi
 done
 
-su - $zmoke_user -c "source $conf_dir/zookeeper-env.sh ; echo 'delete /zk_smoketest' | ${smoke_script} -server $zk_node1:2181"
+su - $smoke_user -c "source $conf_dir/zookeeper-env.sh ; echo 'delete /zk_smoketest' | ${smoke_script} -server $zk_node1:2181"
 if [[ "$ZOOKEEPER_EXIT_CODE" -ne "0" ]] ; then
   echo "Zookeeper Smoke Test: Failed" 
 else

ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/quorum/service_check.pp

@@ -22,7 +22,7 @@ class hdp-zookeeper::quorum::service_check()
 {
   include hdp-zookeeper::params
   $conf_dir = $hdp-zookeeper::params::conf_dir
-
+  $security_enabled = $hdp::params::security_enabled
   $smoke_test_user = $hdp::params::smokeuser
 
   $smoke_script = $hdp::params::zk_smoke_test_script
@@ -44,7 +44,7 @@ define hdp-zookeeper::quorum_smoke_shell_file()
   }
 
   exec { '/tmp/zkSmoke.sh':
-    command   => "sh /tmp/zkSmoke.sh ${smoke_script} ${smoke_test_user} ${conf_dir}",
+    command   => "sh /tmp/zkSmoke.sh ${smoke_script} ${smoke_test_user} ${conf_dir} ${security_enabled}",
     tries     => 3,
     try_sleep => 5,
     require   => File['/tmp/zkSmoke.sh'],

ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/zookeeper/service_check.pp

@@ -23,7 +23,7 @@ class hdp-zookeeper::zookeeper::service_check()
   include hdp-zookeeper::params
   $conf_dir = $hdp-zookeeper::params::conf_dir
   $smoke_script = $hdp::params::zk_smoke_test_script
-
+  $security_enabled = $hdp::params::security_enabled
   $smoke_test_user = $hdp::params::smokeuser
   $zookeeper_smoke_shell_files = ['zkService.sh']
 
@@ -43,7 +43,7 @@ define hdp-zookeeper::zookeeper_smoke_shell_file()
   }
 
   exec { '/tmp/zkService.sh':
-    command   => "sh /tmp/zkService.sh ${smoke_script} ${smoke_test_user} ${conf_dir}",
+    command   => "sh /tmp/zkService.sh ${smoke_script} ${smoke_test_user} ${conf_dir} ${security_enabled}",
     tries     => 3,
     try_sleep => 5,
     require   => File['/tmp/zkService.sh'],