GitList

Browse code

Stop neutron services more explicitly

After an unstack.sh several neutron services are left running. This
change tries to do a better (but not always successful) job of
stopping neutron agents.

stop_process does its own checking to see if a service is enabled
so we don't need to check before calling.

Change-Id: I8becbe9db56121cbc619a6d156b18f6c6d31a6e7

Chris Dent authored on 2015/02/04 01:22:44
Showing 3 changed files

lib/neutron index 0f49476..ededef5 100755
lib/neutron_plugins/services/metering index 51123e2..37ba019 100644
lib/neutron_plugins/services/vpn index 7e80b5b..5912eab 100644

lib/neutron

History View file @ 36891dc

@@ -749,13 +749,21 @@ function start_neutron_agents {
                      # 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

History View file @ 36891dc

@@ -23,7 +23,7 @@ function neutron_agent_metering_configure_agent {
 }
 
 function neutron_metering_stop {
-    :
+    stop_process q-metering
 }
 
 # Restore xtrace

lib/neutron_plugins/services/vpn

History View file @ 36891dc

@@ -28,6 +28,7 @@ function neutron_vpn_stop {
                          if [ -n "$pids" ]; then
                              sudo kill $pids
                          fi
                     +    stop_process q-vpn
+                     }
                      # Restore xtrace

...	...	@@ -23,7 +23,7 @@ function neutron_agent_metering_configure_agent {
23	23	}
24	24
25	25	function neutron_metering_stop {
26		- :
	26	+ stop_process q-metering
27	27	}
28	28
29	29	# Restore xtrace