Merge "Fix stop_neutron metadata agent function"

This commit is contained in:
Jenkins 2014-01-19 05:23:37 +00:00 committed by Gerrit Code Review
commit 3f5250fff3

View File

@ -505,8 +505,7 @@ function stop_neutron() {
[ ! -z "$pid" ] && sudo kill -9 $pid [ ! -z "$pid" ] && sudo kill -9 $pid
fi fi
if is_service_enabled q-meta; then if is_service_enabled q-meta; then
pid=$(ps aux | awk '/neutron-ns-metadata-proxy/ { print $2 }') pkill -9 -f neutron-ns-metadata-proxy
[ ! -z "$pid" ] && sudo kill -9 $pid
fi fi
if is_service_enabled q-lbaas; then if is_service_enabled q-lbaas; then