Merge "q-dhcp: When q-dhcp is enabled, dangling dnsmasq needs to be killed like n-net"

2012-08-07 03:34:37 +00:00 · 2012-08-07 03:34:37 +00:00 · 3d42cdc766
commit 3d42cdc766
parent ecb9036fda 6f85ab3583
1 changed files with 1 additions and 1 deletions
--- a/stack.sh
+++ b/stack.sh
@ -1470,7 +1470,7 @@ EOF'
    sudo rm -rf $NOVA_DIR/instances/*
 fi

-if is_service_enabled n-net; then
+if is_service_enabled n-net q-dhcp; then
    # Delete traces of nova networks from prior runs
    sudo killall dnsmasq || true
    clean_iptables