From 40ac93b806528f49521f6244859d0118c4113aff Mon Sep 17 00:00:00 2001 From: Brian Haley Date: Mon, 12 Mar 2018 14:29:48 -0400 Subject: [PATCH] Config privsep in the linuxbridge agent In order to enable arp_responder code, the agent must have privsep configured or calls to add fdb entries will fail. This is a one-file cherry pick of the master change referenced below as the rest does not apply. Conflicts: neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py Closes-bug: 1754563 (cherry picked from commit e0223edf88abc8c1bb8714121a0df8a9997c7a30) Change-Id: I80b8c02da5d769dcb7bbf6f9e4659889c7c92650 --- .../ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py b/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py index e3299ad68c1..e92938ac3dd 100644 --- a/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py +++ b/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py @@ -39,6 +39,7 @@ from neutron.common import exceptions from neutron.common import profiler as setup_profiler from neutron.common import topics from neutron.common import utils +from neutron.conf.agent import common as agent_config from neutron.plugins.common import constants as p_const from neutron.plugins.common import utils as p_utils from neutron.plugins.ml2.drivers.agent import _agent_manager_base as amb @@ -981,6 +982,7 @@ def main(): common_config.init(sys.argv[1:]) common_config.setup_logging() + agent_config.setup_privsep() try: interface_mappings = helpers.parse_mappings( cfg.CONF.LINUX_BRIDGE.physical_interface_mappings)