x/vmware-nsx
Code Issues Proposed changes

in dhcp_agent, always use quantum.conf root_helper

Browse Source 
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
This commit is contained in:
Peter Feiner
2013-05-08 17:53:21 -04:00
parent 916d54d010
commit 8a9e7ac7f2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
quantum/agent/dhcp_agent.py
View File

@@ -323,7 +323,7 @@ class DhcpAgent(manager.Manager):
pm = external_process.ProcessManager( pm = external_process.ProcessManager(
self.conf, self.conf,
network.id, network.id,
self.conf.root_helper, self.root_helper,
self._ns_name(network)) self._ns_name(network))
pm.enable(callback) pm.enable(callback)
@@ -331,7 +331,7 @@ class DhcpAgent(manager.Manager):
pm = external_process.ProcessManager( pm = external_process.ProcessManager(
self.conf, self.conf,
network.id, network.id,
self.conf.root_helper, self.root_helper,
self._ns_name(network)) self._ns_name(network))
pm.disable() pm.disable()