Browse code
Fix stop_neutron metadata agent function
Currently, stop_neutron fails in Jenkins because it kills itself.
This patch ensure we kill only neutron metadata agent, and not the awk
process in itself.
Change-Id: I25d1d90e002fa9eb3c5bc366cc74cb70a2daa69f
Closes-bug: #1269982
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
Emilien Macchi authored on 2014/01/17 08:03:38Showing 1 changed files
| ... | ... |
@@ -505,8 +505,7 @@ function stop_neutron() {
|
| 505 | 505 |
[ ! -z "$pid" ] && sudo kill -9 $pid |
| 506 | 506 |
fi |
| 507 | 507 |
if is_service_enabled q-meta; then |
| 508 |
- pid=$(ps aux | awk '/neutron-ns-metadata-proxy/ { print $2 }')
|
|
| 509 |
- [ ! -z "$pid" ] && sudo kill -9 $pid |
|
| 508 |
+ pkill -9 -f neutron-ns-metadata-proxy |
|
| 510 | 509 |
fi |
| 511 | 510 |
|
| 512 | 511 |
if is_service_enabled q-lbaas; then |