From d027a9bc776c237304d34d75c3c81cafa25f0cbb Mon Sep 17 00:00:00 2001
From: Brian Haley <bhaley@redhat.com>
Date: Tue, 4 Feb 2020 12:13:14 -0500
Subject: [PATCH] Fix duplicate ID warning during doc build

Both the neutron.base.agent and neutron.l3.agent
option templates contain RPC_EXTRA_OPTS, leading to
a warning during doc builds:

doc/source/configuration/l3-agent.rst:3:
 WARNING: Duplicate ID: "DEFAULT.rpc_response_max_timeout".

It also leads to the rpc_response_max_timeout option
showing up twice in the resultant l3-agent.ini sample
file. For example, when running 'tox -e genconfig'.

Remove it from the list of l3-agent specific options as
it's unnecessary.

Trivial-fix

Change-Id: I70e626dbf9de4bd43952836f8c4d01a693ddac7f
---
 neutron/opts.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/neutron/opts.py b/neutron/opts.py
index 5280b2378ec..603b3dd6ac3 100644
--- a/neutron/opts.py
+++ b/neutron/opts.py
@@ -214,7 +214,6 @@ def list_l3_agent_opts():
          itertools.chain(
              neutron.conf.agent.l3.config.OPTS,
              neutron.conf.service.SERVICE_OPTS,
-             neutron.conf.service.RPC_EXTRA_OPTS,
              neutron.conf.agent.l3.ha.OPTS,
              neutron.conf.agent.common.PD_DRIVER_OPTS,
              neutron.conf.agent.common.RA_OPTS)