From f7273b3052289f3882f69267f6112f6c20dbe894 Mon Sep 17 00:00:00 2001 From: Kevin Benton Date: Wed, 14 Oct 2015 00:24:39 -0700 Subject: [PATCH] Include external bridge deprecation warning in string This is to ensure that the deprecation warning shows up in the docs.[1] 1. https://review.openstack.org/#/c/232353/1/doc/common/tables/neutron-l3_agent.xml Closes-Bug: #1494066 Change-Id: Id2ddec42df3ab376244bbf37b1cdd8b524382f7c --- neutron/agent/l3/config.py | 3 ++- neutron/debug/debug_agent.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/neutron/agent/l3/config.py b/neutron/agent/l3/config.py index b55cab5a1..ce0def645 100644 --- a/neutron/agent/l3/config.py +++ b/neutron/agent/l3/config.py @@ -39,7 +39,8 @@ OPTS = [ cfg.StrOpt('external_network_bridge', default='br-ex', deprecated_for_removal=True, help=_("Name of bridge used for external network " - "traffic.")), + "traffic. This option is deprecated and will be removed " + "in the M release.")), cfg.IntOpt('metadata_port', default=9697, help=_("TCP Port used by Neutron metadata namespace " diff --git a/neutron/debug/debug_agent.py b/neutron/debug/debug_agent.py index 7eba7e9e8..89f17bd09 100644 --- a/neutron/debug/debug_agent.py +++ b/neutron/debug/debug_agent.py @@ -40,7 +40,8 @@ class NeutronDebugAgent(object): cfg.StrOpt('external_network_bridge', default='br-ex', deprecated_for_removal=True, help=_("Name of bridge used for external network " - "traffic.")), + "traffic. This option is deprecated and will be " + "removed in the M release.")), ] def __init__(self, conf, client, driver): -- 2.45.2