Updated Branches:
  refs/heads/trunk 8e211a421 -> 0724670a2

AMBARI-2605. kdestroy not required for zookeeper smoke test. (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/0724670a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/0724670a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/0724670a

Branch: refs/heads/trunk
Commit: 0724670a292ff85744be1cb06ab11ece37c056eb
Parents: 8e211a4
Author: Siddharth Wagle <[email protected]>
Authored: Tue Jul 9 15:53:58 2013 -0700
Committer: Siddharth Wagle <[email protected]>
Committed: Tue Jul 9 16:44:43 2013 -0700

----------------------------------------------------------------------
 .../src/main/puppet/modules/hdp-zookeeper/files/zkSmoke.sh       | 4 ----
 1 file changed, 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/0724670a/ambari-agent/src/main/puppet/modules/hdp-zookeeper/files/zkSmoke.sh
----------------------------------------------------------------------
diff --git 
a/ambari-agent/src/main/puppet/modules/hdp-zookeeper/files/zkSmoke.sh 
b/ambari-agent/src/main/puppet/modules/hdp-zookeeper/files/zkSmoke.sh
index 99feb44..dbfe2be 100644
--- a/ambari-agent/src/main/puppet/modules/hdp-zookeeper/files/zkSmoke.sh
+++ b/ambari-agent/src/main/puppet/modules/hdp-zookeeper/files/zkSmoke.sh
@@ -28,10 +28,6 @@ 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

Reply via email to