Browse code

Merge "Fix stop_neutron metadata agent function" into stable/havana

Jenkins authored on 2014/01/25 12:28:39
Showing 1 changed files
... ...
@@ -460,8 +460,7 @@ function stop_neutron() {
460 460
         [ ! -z "$pid" ] && sudo kill -9 $pid
461 461
     fi
462 462
     if is_service_enabled q-meta; then
463
-        pid=$(ps aux | awk '/neutron-ns-metadata-proxy/ { print $2 }')
464
-        [ ! -z "$pid" ] && sudo kill -9 $pid
463
+        sudo pkill -9 neutron-ns-metadata-proxy || :
465 464
     fi
466 465
 }
467 466