Merge "in dhcp_agent, always use quantum.conf root_helper"

2013-05-09 16:45:05 +00:00
parent 791e220221 8a9e7ac7f2
commit 88fbfa8347
1 changed files with 2 additions and 2 deletions
--- a/quantum/agent/dhcp_agent.py
+++ b/quantum/agent/dhcp_agent.py
@@ -325,7 +325,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)

@@ -333,7 +333,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()