commit 04f6dc24a7845ee139977fa5b0c5e53aad8e99bd
author Emilien Macchi <emilien.macchi@enovance.com> Thu Jan 16 18:03:38 2014 -0500
committer Emilien Macchi <emilien.macchi@enovance.com> Fri Jan 17 00:17:31 2014 -0500
tree b4f58d94dd7fcbcc721feb989cd80f3b62c32093
parent c560cd121a42b177b8a7d54cd232f5539bb23d3e

Fix stop_neutron metadata agent function

Currently, stop_neutron fails in Jenkins because it kills itself.
This patch ensure we kill only neutron metadata agent, and not the awk
process in itself.

Change-Id: I25d1d90e002fa9eb3c5bc366cc74cb70a2daa69f
Closes-bug: #1269982
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>

lib/neutron

diff --git a/lib/neutron b/lib/neutron
index 43f43f9..a909b8b 100644
--- a/lib/neutron
+++ b/lib/neutron
@@ -505,8 +505,7 @@
         [ ! -z "$pid" ] && sudo kill -9 $pid
     fi
     if is_service_enabled q-meta; then
-        pid=$(ps aux | awk '/neutron-ns-metadata-proxy/ { print $2 }')
-        [ ! -z "$pid" ] && sudo kill -9 $pid
+        pkill -9 -f neutron-ns-metadata-proxy
     fi
 
     if is_service_enabled q-lbaas; then