From 423ca751f5d0d102af56e1601de9f9552b91a80e Mon Sep 17 00:00:00 2001 From: Sergey Otpuschennikov Date: Mon, 30 Jun 2014 18:00:20 +0400 Subject: [PATCH] Added patches init-scripts for kill services Related-Bug #1333292 Change-Id: If621767ac11e3a8db719cb11cfb350939bec697d (cherry picked from commit 260bd4a3c572743488fdbeaa28afff28bb982219) --- rpm/SOURCES/neutron-dhcp-agent.init | 5 +++++ rpm/SOURCES/neutron-l3-agent.init | 5 +++++ rpm/SOURCES/neutron-lbaas-agent.init | 5 +++++ rpm/SOURCES/neutron-linuxbridge-agent.init | 5 +++++ rpm/SOURCES/neutron-metadata-agent.init | 5 +++++ rpm/SOURCES/neutron-metering-agent.init | 5 +++++ rpm/SOURCES/neutron-mlnx-agent.init | 5 +++++ rpm/SOURCES/neutron-nec-agent.init | 5 +++++ rpm/SOURCES/neutron-openvswitch-agent.init | 5 +++++ rpm/SOURCES/neutron-ryu-agent.init | 5 +++++ rpm/SOURCES/neutron-server.init | 5 +++++ rpm/SOURCES/neutron-vpn-agent.init | 5 +++++ 12 files changed, 60 insertions(+) diff --git a/rpm/SOURCES/neutron-dhcp-agent.init b/rpm/SOURCES/neutron-dhcp-agent.init index ef93ac2f5..eec9148f0 100644 --- a/rpm/SOURCES/neutron-dhcp-agent.init +++ b/rpm/SOURCES/neutron-dhcp-agent.init @@ -39,6 +39,11 @@ start() { stop() { echo -n $"Stopping $prog: " killproc -p $pidfile $prog + if pgrep $prog &>/dev/null ; then + sleep 2 + pgrep $prog &>/dev/null && \ + killall $prog + fi retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile diff --git a/rpm/SOURCES/neutron-l3-agent.init b/rpm/SOURCES/neutron-l3-agent.init index d07f5a4ee..b96b0f168 100644 --- a/rpm/SOURCES/neutron-l3-agent.init +++ b/rpm/SOURCES/neutron-l3-agent.init @@ -40,6 +40,11 @@ start() { stop() { echo -n $"Stopping $prog: " killproc -p $pidfile $prog + if pgrep $prog &>/dev/null ; then + sleep 2 + pgrep $prog &>/dev/null && \ + killall $prog + fi retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile diff --git a/rpm/SOURCES/neutron-lbaas-agent.init b/rpm/SOURCES/neutron-lbaas-agent.init index 31ac1ce6a..7606ad4f7 100644 --- a/rpm/SOURCES/neutron-lbaas-agent.init +++ b/rpm/SOURCES/neutron-lbaas-agent.init @@ -39,6 +39,11 @@ start() { stop() { echo -n $"Stopping $prog: " killproc -p $pidfile $prog + if pgrep $prog &>/dev/null ; then + sleep 2 + pgrep $prog &>/dev/null && \ + killall $prog + fi retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile diff --git a/rpm/SOURCES/neutron-linuxbridge-agent.init b/rpm/SOURCES/neutron-linuxbridge-agent.init index 141a9750b..ab4445c68 100644 --- a/rpm/SOURCES/neutron-linuxbridge-agent.init +++ b/rpm/SOURCES/neutron-linuxbridge-agent.init @@ -39,6 +39,11 @@ start() { stop() { echo -n $"Stopping $prog: " killproc -p $pidfile $prog + if pgrep $prog &>/dev/null ; then + sleep 2 + pgrep $prog &>/dev/null && \ + killall $prog + fi retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile diff --git a/rpm/SOURCES/neutron-metadata-agent.init b/rpm/SOURCES/neutron-metadata-agent.init index 4a0384dea..40cc5a1a6 100644 --- a/rpm/SOURCES/neutron-metadata-agent.init +++ b/rpm/SOURCES/neutron-metadata-agent.init @@ -39,6 +39,11 @@ start() { stop() { echo -n $"Stopping $prog: " killproc -p $pidfile $prog + if pgrep $prog &>/dev/null ; then + sleep 2 + pgrep $prog &>/dev/null && \ + killall $prog + fi retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile diff --git a/rpm/SOURCES/neutron-metering-agent.init b/rpm/SOURCES/neutron-metering-agent.init index 8c7ab4f01..22ae1aa98 100644 --- a/rpm/SOURCES/neutron-metering-agent.init +++ b/rpm/SOURCES/neutron-metering-agent.init @@ -39,6 +39,11 @@ start() { stop() { echo -n $"Stopping $prog: " killproc -p $pidfile $prog + if pgrep $prog &>/dev/null ; then + sleep 2 + pgrep $prog &>/dev/null && \ + killall $prog + fi retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile diff --git a/rpm/SOURCES/neutron-mlnx-agent.init b/rpm/SOURCES/neutron-mlnx-agent.init index c19f33bfa..b5e514f37 100644 --- a/rpm/SOURCES/neutron-mlnx-agent.init +++ b/rpm/SOURCES/neutron-mlnx-agent.init @@ -39,6 +39,11 @@ start() { stop() { echo -n $"Stopping $prog: " killproc -p $pidfile $prog + if pgrep $prog &>/dev/null ; then + sleep 2 + pgrep $prog &>/dev/null && \ + killall $prog + fi retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile diff --git a/rpm/SOURCES/neutron-nec-agent.init b/rpm/SOURCES/neutron-nec-agent.init index ff1b877f7..b6d5f6ba7 100644 --- a/rpm/SOURCES/neutron-nec-agent.init +++ b/rpm/SOURCES/neutron-nec-agent.init @@ -39,6 +39,11 @@ start() { stop() { echo -n $"Stopping $prog: " killproc -p $pidfile $prog + if pgrep $prog &>/dev/null ; then + sleep 2 + pgrep $prog &>/dev/null && \ + killall $prog + fi retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile diff --git a/rpm/SOURCES/neutron-openvswitch-agent.init b/rpm/SOURCES/neutron-openvswitch-agent.init index 14e53a9cb..d7481affc 100644 --- a/rpm/SOURCES/neutron-openvswitch-agent.init +++ b/rpm/SOURCES/neutron-openvswitch-agent.init @@ -39,6 +39,11 @@ start() { stop() { echo -n $"Stopping $prog: " killproc -p $pidfile $prog + if pgrep $prog &>/dev/null ; then + sleep 2 + pgrep $prog &>/dev/null && \ + killall $prog + fi retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile diff --git a/rpm/SOURCES/neutron-ryu-agent.init b/rpm/SOURCES/neutron-ryu-agent.init index 89dcaced8..740edd882 100644 --- a/rpm/SOURCES/neutron-ryu-agent.init +++ b/rpm/SOURCES/neutron-ryu-agent.init @@ -39,6 +39,11 @@ start() { stop() { echo -n $"Stopping $prog: " killproc -p $pidfile $prog + if pgrep $prog &>/dev/null ; then + sleep 2 + pgrep $prog &>/dev/null && \ + killall $prog + fi retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile diff --git a/rpm/SOURCES/neutron-server.init b/rpm/SOURCES/neutron-server.init index d5ccc9f0a..d545b8180 100644 --- a/rpm/SOURCES/neutron-server.init +++ b/rpm/SOURCES/neutron-server.init @@ -39,6 +39,11 @@ start() { stop() { echo -n $"Stopping $prog: " killproc -p $pidfile $prog + if pgrep $prog-server &>/dev/null ; then + sleep 2 + pgrep $prog-server &>/dev/null && \ + killall $prog-server + fi retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile diff --git a/rpm/SOURCES/neutron-vpn-agent.init b/rpm/SOURCES/neutron-vpn-agent.init index feb4af521..4537036c9 100644 --- a/rpm/SOURCES/neutron-vpn-agent.init +++ b/rpm/SOURCES/neutron-vpn-agent.init @@ -41,6 +41,11 @@ start() { stop() { echo -n $"Stopping $prog: " killproc -p $pidfile $prog + if pgrep $prog &>/dev/null ; then + sleep 2 + pgrep $prog &>/dev/null && \ + killall $prog + fi retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile -- 2.32.3