| commit | 3d42cdc76650c5568d9660f53a83383511868dda | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Tue Aug 07 03:34:37 2012 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Tue Aug 07 03:34:37 2012 +0000 |
| tree | 8eed4b57d851cb7bd65ff988bc090a08be122e8f | |
| parent | ecb9036fdafaf55e81bab54df513aa4579ae46bf [diff] | |
| parent | 6f85ab3583b31a2f84c66331f8c091b08d2d2b78 [diff] |
Merge "q-dhcp: When q-dhcp is enabled, dangling dnsmasq needs to be killed like n-net"
diff --git a/stack.sh b/stack.sh index ae06629..7143433 100755 --- a/stack.sh +++ b/stack.sh
@@ -1470,7 +1470,7 @@ 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