Browse code
q-dhcp: When q-dhcp is enabled, dangling dnsmasq needs to be killed like n-net
fixes bug 1033428
Kill dnsmasq processes on startup like n-net case.
q-dhcp(quantum dhcp agent) forks dns-masq child processes.
But those dns-masq processes are not killed on initialization unlike n-net.
So non-first run of q-dhcp fails due to stale dns-masq process.
Change-Id: I15f464e527a5258f88da573facfa2eef4c03f753
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Isaku Yamahata authored on 2012/08/06 16:56:10Showing 1 changed files
| ... | ... |
@@ -1466,7 +1466,7 @@ EOF' |
| 1466 | 1466 |
sudo rm -rf $NOVA_DIR/instances/* |
| 1467 | 1467 |
fi |
| 1468 | 1468 |
|
| 1469 |
-if is_service_enabled n-net; then |
|
| 1469 |
+if is_service_enabled n-net q-dhcp; then |
|
| 1470 | 1470 |
# Delete traces of nova networks from prior runs |
| 1471 | 1471 |
sudo killall dnsmasq || true |
| 1472 | 1472 |
clean_iptables |