From: Mitsuhiro SHIGEMATSU <shigematsu.mitsuhiro@lab.ntt.co.jp>
Date: Mon, 9 Mar 2015 09:55:46 +0000 (+0900)
Subject: Fix wrong log output in neutron/neutron/agent/linux/dhcp.py
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=0198a8c91f973c5a205b64e21ed9057ab33d5615;p=openstack-build%2Fneutron-build.git

Fix wrong log output in neutron/neutron/agent/linux/dhcp.py

When all subnets are turning off dhcp and killing the process,
this wrong log output "Killing dhcpmasq for network ..." occurs.
It should be "Killing dnsmasq for network ..."

Change-Id: Ic12dc66365d9d127b59279581227060ca6e65105
Closes-Bug: #1429775
---

diff --git a/neutron/agent/linux/dhcp.py b/neutron/agent/linux/dhcp.py
index c558167c0..374589722 100644
--- a/neutron/agent/linux/dhcp.py
+++ b/neutron/agent/linux/dhcp.py
@@ -413,7 +413,7 @@ class Dnsmasq(DhcpLocalProcess):
         # If all subnets turn off dhcp, kill the process.
         if not self._enable_dhcp():
             self.disable()
-            LOG.debug('Killing dhcpmasq for network since all subnets have '
+            LOG.debug('Killing dnsmasq for network since all subnets have '
                       'turned off DHCP: %s', self.network.id)
             return