Added patches init-scripts for kill services

Related-Bug #1333292

Change-Id: If621767ac11e3a8db719cb11cfb350939bec697d
(cherry picked from commit 260bd4a3c572743488fdbeaa28afff28bb982219)

diff --git a/rpm/SOURCES/neutron-dhcp-agent.init b/rpm/SOURCES/neutron-dhcp-agent.init
index ef93ac2f59a9b44ab9ccb43976f37296f572703d..eec9148f07a5ce542fdca468da62707d01c92faa 100644 (file)
--- 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 d07f5a4ee086fc923391f0dc799ad3c9ab3d6c53..b96b0f168a606f86f12b661595a7cabaac556a69 100644 (file)
--- 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 31ac1ce6a49965900757c6f964131e00b98cf62b..7606ad4f7b3f3c2b08222657576ee06890f2478b 100644 (file)
--- 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 141a9750bf5588f117b91df30b57ec2e8e2f146a..ab4445c68bb794eefb2518ad109b22b837d7d336 100644 (file)
--- 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 4a0384dea79dcddcea69f3ba6c1d041e1abffb9c..40cc5a1a6250b81a0bac5375815ad7c08b2e32ea 100644 (file)
--- 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 8c7ab4f016684e1cc5e227104631e5e808986b7a..22ae1aa98146c2644b2a43ba739dbd44313c4ee3 100644 (file)
--- 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 c19f33bfaaebebc2c3e7b0ae8cdad9e0b49c1c44..b5e514f37388cfb229df1714f5e95043b23454ac 100644 (file)
--- 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 ff1b877f77dba91b91b20b12c4ac60da686b3f02..b6d5f6ba7b15521fd0e0f77e89cc9c19ef62aa8f 100644 (file)
--- 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 14e53a9cb4b233772c9a2ef930ac7daba4ac2b03..d7481affcf33fef2f055c2346e288eff9cdb198e 100644 (file)
--- 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 89dcaced8cd9bda2a85aa3fb4987c5212bd33031..740edd8827d311e8f62d821739d5e714ea4ade94 100644 (file)
--- 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 d5ccc9f0a51783296b08c26db105b34a386cc540..d545b8180aeb8c2e4bc0c5ef4e19fd1b9856c894 100644 (file)
--- 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 feb4af521f19656034a418885a96afd0736005b5..4537036c9d9181a56300c5271dd4662e2198970a 100644 (file)
--- 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