openstack/devstack
Code Issues Proposed changes

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

Browse Source 
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>
This commit is contained in:
Isaku Yamahata 2012-08-06 16:56:10 +09:00
parent 43278a3cb5
commit 6f85ab3583
1 changed files with 1 additions and 1 deletions

2
stack.sh

@ -1466,7 +1466,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