commit 52844a11dddb7e0631f9d11eb74251b17e05beb5
author Jenkins <jenkins@review.openstack.org> Thu Jul 02 20:13:06 2015 +0000
committer Gerrit Code Review <review@openstack.org> Thu Jul 02 20:13:06 2015 +0000
tree fbebe33ed156559d0d4e43bbe21327836e66a6e8
parent 7a0f6833ad75a61ddf60a1b34e8d7f080d29259e
parent f750a6fedbb34399e1ee4dd540c13028d53c0e13

Merge "Already dead process tolerance in unstack.sh"

functions-common

diff --git a/functions-common b/functions-common
index 6f229d0..483b1fa 100644
--- a/functions-common
+++ b/functions-common
@@ -1342,7 +1342,7 @@
 
     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
 }
 

lib/neutron_plugins/services/loadbalancer

diff --git a/lib/neutron_plugins/services/loadbalancer b/lib/neutron_plugins/services/loadbalancer
index f465cc9..34190f9 100644
--- a/lib/neutron_plugins/services/loadbalancer
+++ b/lib/neutron_plugins/services/loadbalancer
@@ -42,7 +42,7 @@
 
 function neutron_lbaas_stop {
     pids=$(ps aux | awk '/haproxy/ { print $2 }')
-    [ ! -z "$pids" ] && sudo kill $pids
+    [ ! -z "$pids" ] && sudo kill $pids || true
 }
 
 # Restore xtrace

lib/swift

diff --git a/lib/swift b/lib/swift
index 0cd51aa..5b73981 100644
--- a/lib/swift
+++ b/lib/swift
@@ -772,7 +772,7 @@
         stop_process s-${type}
     done
     # Blast out any stragglers
-    pkill -f swift-
+    pkill -f swift- || true
 }
 
 function swift_configure_tempurls {