From: rexlee8776 <limingjiang@huawei.com>
Date: Fri, 31 Aug 2018 07:08:45 +0000 (+0000)
Subject: tc046 kill keystone process condition incorrect - dovetail
X-Git-Tag: opnfv-7.0.0~65^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F27%2F61627%2F2;p=yardstick.git

tc046 kill keystone process condition incorrect - dovetail

Change-Id: If01abfd5a99b4cea74f835e258f3a982af9446cd
Signed-off-by: rexlee8776 <limingjiang@huawei.com>
---

diff --git a/yardstick/benchmark/scenarios/availability/ha_tools/fault_process_kill.bash b/yardstick/benchmark/scenarios/availability/ha_tools/fault_process_kill.bash
index d34ce9338..cda469cf9 100755
--- a/yardstick/benchmark/scenarios/availability/ha_tools/fault_process_kill.bash
+++ b/yardstick/benchmark/scenarios/availability/ha_tools/fault_process_kill.bash
@@ -16,7 +16,7 @@ set -e
 process_name=$1
 
 if [ "$process_name" = "keystone" ]; then
-    for pid in $(ps aux | grep "keystone" | grep -iv heartbeat | grep -iv monitor | grep -v grep | grep -v /bin/sh | awk '{print $2}'); \
+    for pid in $(ps aux | grep "keystone" | grep -iv monitor | grep -v grep | grep -v /bin/sh | awk '{print $2}'); \
         do
             kill -9 "${pid}"
         done
@@ -26,7 +26,7 @@ elif [ "$process_name" = "haproxy" ]; then
             kill -9 "${pid}"
         done
 else
-    for pid in $(pgrep -fa [^-_a-zA-Z0-9]${process_name} | grep -iv heartbeat | awk '{print $1}');
+    for pid in $(pgrep -fa [^-_a-zA-Z0-9]${process_name} | awk '{print $1}');
         do
             kill -9 "${pid}"
         done