Merge "in dhcp_agent, always use quantum.conf root_helper"
This commit is contained in:
@@ -325,7 +325,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)
|
||||||
|
|
||||||
@@ -333,7 +333,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()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user