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

diff --git a/etc/l3_agent.ini b/etc/l3_agent.ini
index 29a20de95e70b6fb81dc35b797ffd7844db29c64..b3ac40c338269096c1b244b606d08f98d7b12049 100644 (file)
--- 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 dfb72bf1d5d1283e82ddac6f1f4075fcabd8ac34..b55cab5a1e511c2649f99a8e5640939834e7e852 100644 (file)
--- 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 0b6e053edbbd3a4066b1e86c53469750d9da70db..7eba7e9e82511060dd7af6df12fa348f94cca143 100644 (file)
--- 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.")),
     ]