diff --git a/functions-common b/functions-common index 6f229d0fb6..483b1fa696 100644 --- a/functions-common +++ b/functions-common @@ -1342,7 +1342,7 @@ function screen_stop_service { if is_service_enabled $service; then # Clean up the screen window - screen -S $SCREEN_NAME -p $service -X kill + screen -S $SCREEN_NAME -p $service -X kill || true fi } diff --git a/lib/neutron_plugins/services/loadbalancer b/lib/neutron_plugins/services/loadbalancer index f465cc94b4..34190f9a56 100644 --- a/lib/neutron_plugins/services/loadbalancer +++ b/lib/neutron_plugins/services/loadbalancer @@ -42,7 +42,7 @@ function neutron_agent_lbaas_configure_agent { function neutron_lbaas_stop { pids=$(ps aux | awk '/haproxy/ { print $2 }') - [ ! -z "$pids" ] && sudo kill $pids + [ ! -z "$pids" ] && sudo kill $pids || true } # Restore xtrace diff --git a/lib/swift b/lib/swift index 0cd51aaddf..5b73981ed2 100644 --- a/lib/swift +++ b/lib/swift @@ -772,7 +772,7 @@ function stop_swift { stop_process s-${type} done # Blast out any stragglers - pkill -f swift- + pkill -f swift- || true } function swift_configure_tempurls {