From 722fe6732a2165bdf610d6dc10060a3285e534d7 Mon Sep 17 00:00:00 2001 From: Gary Kotton Date: Wed, 18 Jul 2012 07:43:01 -0400 Subject: [PATCH] Ensure that dnsmasq is terminated when running unstack.sh If the Quantum dhcp-agent is enabled then we ensure that the dnsmasq process is termated when running unstack.sh Change-Id: I0aee8b806c61dff42400a3b8552b7c748e9c5adf --- unstack.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/unstack.sh b/unstack.sh index 641d34e4cf..6a55a0a1aa 100755 --- a/unstack.sh +++ b/unstack.sh @@ -63,3 +63,8 @@ if [[ -n "$UNSTACK_ALL" ]]; then stop_service mysql fi fi + +# Quantum dhcp agent runs dnsmasq +if is_service_enabled q-dhcp; then + sudo kill -9 $(ps aux | awk '/[d]nsmasq.+interface=tap/ { print $2 }') +fi