In Precise and Quantal, we nuke the dnsmasq launched by NetworkManager
Fixes LP# 993666
Change-Id: I4b39010765e2cbbea1ca3fc3120bf329015b7a56
... | ... |
@@ -967,7 +967,14 @@ fi |
967 | 967 |
|
968 | 968 |
if is_service_enabled n-net q-dhcp; then |
969 | 969 |
# Delete traces of nova networks from prior runs |
970 |
- sudo killall dnsmasq || true |
|
970 |
+ # Do not kill any dnsmasq instance spawned by NetworkManager |
|
971 |
+ netman_pid=$(pidof NetworkManager || true) |
|
972 |
+ if [ -z "$netman_pid" ]; then |
|
973 |
+ sudo killall dnsmasq || true |
|
974 |
+ else |
|
975 |
+ sudo ps h -o pid,ppid -C dnsmasq | grep -v $netman_pid | awk '{print $1}' | sudo xargs kill || true |
|
976 |
+ fi |
|
977 |
+ |
|
971 | 978 |
clean_iptables |
972 | 979 |
rm -rf ${NOVA_STATE_PATH}/networks |
973 | 980 |
sudo mkdir -p ${NOVA_STATE_PATH}/networks |