Browse Source

Merge "No rpc_response_max_timeout in LB-agent" into stable/train

changes/36/744436/1
Zuul 1 week ago
committed by Gerrit Code Review
parent
commit
64bdb96eaf
2 changed files with 5 additions and 0 deletions
  1. +2
    -0
      neutron/opts.py
  2. +3
    -0
      neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py

+ 2
- 0
neutron/opts.py View File

@@ -191,6 +191,8 @@ def list_dhcp_agent_opts():

def list_linux_bridge_opts():
return [
('DEFAULT',
neutron.conf.service.RPC_EXTRA_OPTS),
('linux_bridge',
neutron.conf.plugins.ml2.drivers.linuxbridge.bridge_opts),
('vxlan',


+ 3
- 0
neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py View File

@@ -41,6 +41,7 @@ from neutron.common import config as common_config
from neutron.common import profiler as setup_profiler
from neutron.common import utils
from neutron.conf.agent import common as agent_config
from neutron.conf import service as service_conf
from neutron.plugins.ml2.drivers.agent import _agent_manager_base as amb
from neutron.plugins.ml2.drivers.agent import _common_agent as ca
from neutron.plugins.ml2.drivers.agent import config as cagt_config # noqa
@@ -1031,6 +1032,8 @@ def main():

common_config.setup_logging()
agent_config.setup_privsep()
service_conf.register_service_opts(service_conf.RPC_EXTRA_OPTS, cfg.CONF)

try:
interface_mappings = helpers.parse_mappings(
cfg.CONF.LINUX_BRIDGE.physical_interface_mappings)


Loading…
Cancel
Save