X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=centos7%2Frpm%2FSOURCES%2Fneutron-netns-cleanup.init;h=e2aac5c8b108be6f69467f97c453dbb12424c359;hb=3421ecb02ab9522576c94908232ecdbc26f8c44d;hp=f7b921bcf96bf2b8b20d531c48d93788b27f2775;hpb=b12db4774d595401dbb6ff8fce4c37e1c60d16f6;p=openstack-build%2Fneutron-build.git

diff --git a/centos7/rpm/SOURCES/neutron-netns-cleanup.init b/centos7/rpm/SOURCES/neutron-netns-cleanup.init
index f7b921bcf..e2aac5c8b 100644
--- a/centos7/rpm/SOURCES/neutron-netns-cleanup.init
+++ b/centos7/rpm/SOURCES/neutron-netns-cleanup.init
@@ -21,7 +21,6 @@ proj=neutron
 prog=$proj-netns-cleanup
 exec="/usr/bin/$prog"
 configs=(
-    "/usr/share/$proj/$proj-dist.conf" \
     "/etc/$proj/$proj.conf" \
     "/etc/$proj/dhcp_agent.ini"
 )
@@ -43,6 +42,7 @@ clean() {
 	killall neutron-keepalived-state-change 2>/dev/null || :
 	kill $(ps ax | grep -e "keepalived.*\.pid-vrrp" | awk '{print $1}') 2>/dev/null || :
 	kill $(ps ax | grep -e "radvd.*\.pid\.radvd" | awk '{print $1}') 2>/dev/null || :
+	kill $(ps ax | grep -e "haproxy .*/conf .*/pid" | awk '{print $1}') 2>/dev/null || :
     fi
     return $?
 }