openstack
/
neutron
Code Issues Proposed changes

Merge "Deprecate external_network_bridge option in L3 agent"

This commit is contained in:
Jenkins 2015-09-04 22:37:17 +00:00 committed by Gerrit Code Review
parent 35a9d72f46 5aab6a5779
commit 72d9d2cea9
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/l3_agent.ini
View File

@ -64,6 +64,7 @@
# Name of bridge used for external network traffic. This should be set to # 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 # empty value for the linux bridge. when this parameter is set, each L3 agent
# can be associated with no more than one external network. # 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 # external_network_bridge = br-ex
# TCP Port used by Neutron metadata server # TCP Port used by Neutron metadata server

1
neutron/agent/l3/config.py
View File

@ -37,6 +37,7 @@ OPTS = [
"running on a centralized node (or in single-host " "running on a centralized node (or in single-host "
"deployments, e.g. devstack)")), "deployments, e.g. devstack)")),
cfg.StrOpt('external_network_bridge', default='br-ex', cfg.StrOpt('external_network_bridge', default='br-ex',
deprecated_for_removal=True,
help=_("Name of bridge used for external network " help=_("Name of bridge used for external network "
"traffic.")), "traffic.")),
cfg.IntOpt('metadata_port', cfg.IntOpt('metadata_port',

1
neutron/debug/debug_agent.py
View File

@ -38,6 +38,7 @@ class NeutronDebugAgent(object):
OPTS = [ OPTS = [
# Needed for drivers # Needed for drivers
cfg.StrOpt('external_network_bridge', default='br-ex', cfg.StrOpt('external_network_bridge', default='br-ex',
deprecated_for_removal=True,
help=_("Name of bridge used for external network " help=_("Name of bridge used for external network "
"traffic.")), "traffic.")),
] ]