Browse code

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

Jenkins authored on 2012/08/07 12:34:37
Showing 1 changed files
... ...
@@ -1470,7 +1470,7 @@ EOF'
1470 1470
     sudo rm -rf $NOVA_DIR/instances/*
1471 1471
 fi
1472 1472
 
1473
-if is_service_enabled n-net; then
1473
+if is_service_enabled n-net q-dhcp; then
1474 1474
     # Delete traces of nova networks from prior runs
1475 1475
     sudo killall dnsmasq || true
1476 1476
     clean_iptables