openstack
/
neutron
Code Issues Proposed changes

Fix deprecation warning for external_network_bridge 

We only want this to warn when a deployer has set anything other
than a blank string. The olso cfg would warn whenever it was set
so it was incorrectly warning on the value we want operators to
set it to.

This changes the cfg option to not use deprecated for removal and
the L3 agent config validation to emit a warning if its not set
to the value we are suggesting.

Change-Id: If533cf7c4c379be78f5a15073accaff7f65973ab
Closes-Bug: #1563070
This commit is contained in:
Kevin Benton 2016-03-28 14:14:15 -07:00
parent ab614a10a7
commit 8382ac3717
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,6 @@ AVAILABILITY_ZONE_OPTS = [
EXT_NET_BRIDGE_OPTS = [
cfg.StrOpt('external_network_bridge', default='br-ex',
deprecated_for_removal=True,
help=_("Name of bridge used for external network "
"traffic. This should be set to an empty value for the "
"Linux Bridge. When this parameter is set, each L3 "

6
neutron/agent/l3/agent.py
View File

@ -263,6 +263,12 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback,
msg = _LE('An interface driver must be specified')
LOG.error(msg)
raise SystemExit(1)
if self.conf.external_network_bridge:
LOG.warning(_LW("Using an 'external_network_bridge' value other "
"than '' is deprecated. Any other values may "
"not be supported in the future. Note that the "
"default value is 'br-ex' so it must be "
"explicitly set to a blank value."))
if self.conf.ipv6_gateway:
# ipv6_gateway configured. Check for valid v6 link-local address.