commit ff9584f5d7095662eead2f9a0a6618d377ceea57
author Jenkins <jenkins@review.openstack.org> Wed May 15 11:12:24 2013 +0000
committer Gerrit Code Review <review@openstack.org> Wed May 15 11:12:24 2013 +0000
tree 09cf85d6b652e547390903a6370baf08bceb2c07
parent 526b2ea06987b011f26cb8434fcc20cd8b135bef
parent 2ae6acfe38db1142a4a93471bc15d642e40c3db6

Merge "Stop quantum-ns-metadata-proxy process on unstack"

lib/quantum

diff --git a/lib/quantum b/lib/quantum
index 293ef3a..dfd73e9 100644
--- a/lib/quantum
+++ b/lib/quantum
@@ -397,6 +397,10 @@
         pid=$(ps aux | awk '/[d]nsmasq.+interface=(tap|ns-)/ { print $2 }')
         [ ! -z "$pid" ] && sudo kill -9 $pid
     fi
+    if is_service_enabled q-meta; then
+        pid=$(ps aux | awk '/quantum-ns-metadata-proxy/ { print $2 }')
+        [ ! -z "$pid" ] && sudo kill -9 $pid
+    fi
 }
 
 # cleanup_quantum() - Remove residual data files, anything left over from previous