commit f9222da73fa52b389f38521ea4df553c562cd798
author Jenkins <jenkins@review.openstack.org> Fri Feb 06 20:34:23 2015 +0000
committer Gerrit Code Review <review@openstack.org> Fri Feb 06 20:34:23 2015 +0000
tree 9250c4247509e6d117e62657fbc4aaf064bf6487
parent e79678af5ed1621cd8740879b496a0d3716ab8b1
parent 36891dc1435741b8caf747b8ff82d6b25594f2c5

Merge "Stop neutron services more explicitly"

lib/neutron

diff --git a/lib/neutron b/lib/neutron
index 0972679..2c7ec94 100755
--- a/lib/neutron
+++ b/lib/neutron
@@ -748,13 +748,21 @@
 # stop_neutron() - Stop running processes (non-screen)
 function stop_neutron {
     if is_service_enabled q-dhcp; then
+        stop_process q-dhcp
         pid=$(ps aux | awk '/[d]nsmasq.+interface=(tap|ns-)/ { print $2 }')
         [ ! -z "$pid" ] && sudo kill -9 $pid
     fi
+
+    stop_process q-svc
+    stop_process q-l3
+
     if is_service_enabled q-meta; then
         sudo pkill -9 -f neutron-ns-metadata-proxy || :
+        stop_process q-meta
     fi
 
+    stop_process q-agt
+
     if is_service_enabled q-lbaas; then
         neutron_lbaas_stop
     fi

lib/neutron_plugins/services/metering

diff --git a/lib/neutron_plugins/services/metering b/lib/neutron_plugins/services/metering
index 51123e2..37ba019 100644
--- a/lib/neutron_plugins/services/metering
+++ b/lib/neutron_plugins/services/metering
@@ -23,7 +23,7 @@
 }
 
 function neutron_metering_stop {
-    :
+    stop_process q-metering
 }
 
 # Restore xtrace

lib/neutron_plugins/services/vpn

diff --git a/lib/neutron_plugins/services/vpn b/lib/neutron_plugins/services/vpn
index 7e80b5b..5912eab 100644
--- a/lib/neutron_plugins/services/vpn
+++ b/lib/neutron_plugins/services/vpn
@@ -28,6 +28,7 @@
     if [ -n "$pids" ]; then
         sudo kill $pids
     fi
+    stop_process q-vpn
 }
 
 # Restore xtrace