From 5aab6a577950525d8f656d373f2e46a229fa600b Mon Sep 17 00:00:00 2001 From: Kevin Benton Date: Tue, 1 Sep 2015 19:35:33 -0700 Subject: [PATCH] Deprecate external_network_bridge option in L3 agent This option provides another way to attach to a specific bridge that is not quite equivalent with how bridge_mappings work in the L2 agent. This creates inconsistencies between how the L3 agent behaves when configured with a bridge_mapping and provider properties of the Neutron network vs. when it just ignores all L2 stuff and plugs itself directly into the bridge. See the bug report for more info. Change-Id: I37de3cd6eaaf34856fa72753f471f4f0a9381836 Closes-Bug: #1491668 --- etc/l3_agent.ini | 1 + neutron/agent/l3/config.py | 1 + neutron/debug/debug_agent.py | 1 + 3 files changed, 3 insertions(+) diff --git a/etc/l3_agent.ini b/etc/l3_agent.ini index 29a20de95e7..b3ac40c3382 100644 --- a/etc/l3_agent.ini +++ b/etc/l3_agent.ini @@ -64,6 +64,7 @@ # Name of bridge used for external network traffic. This should be set to # empty value for the linux bridge. when this parameter is set, each L3 agent # can be associated with no more than one external network. +# This option is deprecated and will be removed in the M release. # external_network_bridge = br-ex # TCP Port used by Neutron metadata server diff --git a/neutron/agent/l3/config.py b/neutron/agent/l3/config.py index dfb72bf1d5d..b55cab5a1e5 100644 --- a/neutron/agent/l3/config.py +++ b/neutron/agent/l3/config.py @@ -37,6 +37,7 @@ OPTS = [ "running on a centralized node (or in single-host " "deployments, e.g. devstack)")), cfg.StrOpt('external_network_bridge', default='br-ex', + deprecated_for_removal=True, help=_("Name of bridge used for external network " "traffic.")), cfg.IntOpt('metadata_port', diff --git a/neutron/debug/debug_agent.py b/neutron/debug/debug_agent.py index 0b6e053edbb..7eba7e9e825 100644 --- a/neutron/debug/debug_agent.py +++ b/neutron/debug/debug_agent.py @@ -38,6 +38,7 @@ class NeutronDebugAgent(object): OPTS = [ # Needed for drivers cfg.StrOpt('external_network_bridge', default='br-ex', + deprecated_for_removal=True, help=_("Name of bridge used for external network " "traffic.")), ]