diff --git a/doc/config-reference/source/samples/neutron/l3_agent.ini.sample b/doc/config-reference/source/samples/neutron/l3_agent.ini.sample
index 9a0885a513..b204763153 100644
--- a/doc/config-reference/source/samples/neutron/l3_agent.ini.sample
+++ b/doc/config-reference/source/samples/neutron/l3_agent.ini.sample
@@ -46,12 +46,6 @@
 # feature is disabled (integer value)
 #send_arp_for_ha = 3
 
-# If non-empty, the l3 agent can only configure a router that has the matching
-# router ID. (string value)
-# This option is deprecated for removal.
-# Its value may be silently ignored in the future.
-#router_id =
-
 # Indicates that this L3 agent should also handle routers that do not have an
 # external network gateway configured. This option should be True only for a
 # single agent in a Neutron deployment, and may be False for all agents if all
diff --git a/doc/config-reference/source/tables/neutron-l3_agent.rst b/doc/config-reference/source/tables/neutron-l3_agent.rst
index 487ed7b7ee..e0cc688a5a 100644
--- a/doc/config-reference/source/tables/neutron-l3_agent.rst
+++ b/doc/config-reference/source/tables/neutron-l3_agent.rst
@@ -60,8 +60,6 @@
      - (Integer) Maximum number of L3 agents which a HA router will be scheduled on. If it is set to 0 then the router will be scheduled on every agent.
    * - ``min_l3_agents_per_router`` = ``2``
      - (Integer) Minimum number of L3 agents which a HA router will be scheduled on. If it is set to 0 then the router will be scheduled on every agent.
-   * - ``router_id`` =
-     - (String) DEPRECATED: If non-empty, the l3 agent can only configure a router that has the matching router ID.
    * - ``send_arp_for_ha`` = ``3``
      - (Integer) Send this many gratuitous ARPs for HA setup, if less than or equal to 0, the feature is disabled
    * - **[AGENT]**
diff --git a/tools/autogenerate-config-flagmappings/neutron.flagmappings b/tools/autogenerate-config-flagmappings/neutron.flagmappings
index abbffbc054..1ea1d915ba 100644
--- a/tools/autogenerate-config-flagmappings/neutron.flagmappings
+++ b/tools/autogenerate-config-flagmappings/neutron.flagmappings
@@ -136,7 +136,6 @@ resync_interval dhcp_agent
 retry_until_window api
 router_auto_schedule scheduler
 router_distributed dvr
-router_id l3_agent
 router_scheduler_driver scheduler
 rpc_backend rpc
 rpc_cast_timeout rpc