From d5ea235865d6fe9c3d85c1cb8cb2250e7d7b7d4a Mon Sep 17 00:00:00 2001 From: Cedric Brandily Date: Sun, 22 Nov 2015 23:22:58 +0100 Subject: [PATCH] Deprecate l3-agent router_id option L3-agent router_id option has been defined in order to associate a l3-agent to a specific router when use_namespaces=False. The option use_namespaces has been removed in Mitaka, so router_id option is no longer needed and can be deprecated in order to prepare its removal in N cycle. Closes-Bug: #1518776 Change-Id: Id79499ccbf3ea69ca4cd7e4b2f812f6dbc0406e0 --- etc/l3_agent.ini | 1 + neutron/agent/l3/config.py | 1 + releasenotes/notes/deprecate-router_id-34aca9ea5ee9e789.yaml | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 releasenotes/notes/deprecate-router_id-34aca9ea5ee9e789.yaml diff --git a/etc/l3_agent.ini b/etc/l3_agent.ini index be0ab852b..a8efb63d2 100644 --- a/etc/l3_agent.ini +++ b/etc/l3_agent.ini @@ -20,6 +20,7 @@ # If non-empty, the l3 agent can only configure a router that has the matching # router ID. +# This option is deprecated and will be removed in the N release. # router_id = # When external_network_bridge is set, each L3 agent can be associated diff --git a/neutron/agent/l3/config.py b/neutron/agent/l3/config.py index 856ddecc2..78cd6eb3b 100644 --- a/neutron/agent/l3/config.py +++ b/neutron/agent/l3/config.py @@ -49,6 +49,7 @@ OPTS = [ help=_("Send this many gratuitous ARPs for HA setup, if " "less than or equal to 0, the feature is disabled")), cfg.StrOpt('router_id', default='', + deprecated_for_removal=True, help=_("If non-empty, the l3 agent can only configure a router " "that has the matching router ID.")), cfg.BoolOpt('handle_internal_only_routers', diff --git a/releasenotes/notes/deprecate-router_id-34aca9ea5ee9e789.yaml b/releasenotes/notes/deprecate-router_id-34aca9ea5ee9e789.yaml new file mode 100644 index 000000000..389ef87d5 --- /dev/null +++ b/releasenotes/notes/deprecate-router_id-34aca9ea5ee9e789.yaml @@ -0,0 +1,5 @@ +--- +prelude: > + Deprecate router_id option in order to prepare its removal in N cycle. +upgrade: + - router_id option deprecation -- 2.45.2