in dhcp_agent, always use quantum.conf root_helper

Fixes bug #1178003.

For the most part, the dhcp agent uses the root_helper setting from the [AGENT]
section of /etc/quantum/quantum.conf. However, in a couple of spots, the
root_helper setting from the [DEFAULT] section of /etc/quantum/dhcp_agent.ini
was being used.

Change-Id: Id2f3140374a705cf7a0d2a784e4f321cc54f602e

diff --git a/quantum/agent/dhcp_agent.py b/quantum/agent/dhcp_agent.py
index 7c64d8d82549ffc7acc23546cdc4554ba49c510b..595677a696a02c1162610ce1d8b2fa17dc4890c8 100644 (file)
--- a/quantum/agent/dhcp_agent.py
+++ b/quantum/agent/dhcp_agent.py
@@ -323,7 +323,7 @@ class DhcpAgent(manager.Manager):
         pm = external_process.ProcessManager(
             self.conf,
             network.id,
-            self.conf.root_helper,
+            self.root_helper,
             self._ns_name(network))
         pm.enable(callback)
 
@@ -331,7 +331,7 @@ class DhcpAgent(manager.Manager):
         pm = external_process.ProcessManager(
             self.conf,
             network.id,
-            self.conf.root_helper,
+            self.root_helper,
             self._ns_name(network))
         pm.disable()