From 8a9e7ac7f2e3901d33c8a6a91dffec1e16b13f0d Mon Sep 17 00:00:00 2001 From: Peter Feiner Date: Wed, 8 May 2013 17:53:21 -0400 Subject: [PATCH] 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 --- quantum/agent/dhcp_agent.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quantum/agent/dhcp_agent.py b/quantum/agent/dhcp_agent.py index 7c64d8d82..595677a69 100644 --- 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() -- 2.45.2