Merge "Fix deprecation warning for external_network_bridge" into stable/mitaka
This commit is contained in:
commit
2d5776cfd7
|
@ -84,7 +84,6 @@ AVAILABILITY_ZONE_OPTS = [
|
||||||
|
|
||||||
EXT_NET_BRIDGE_OPTS = [
|
EXT_NET_BRIDGE_OPTS = [
|
||||||
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. This should be set to an empty value for the "
|
"traffic. This should be set to an empty value for the "
|
||||||
"Linux Bridge. When this parameter is set, each L3 "
|
"Linux Bridge. When this parameter is set, each L3 "
|
||||||
|
|
|
@ -263,6 +263,12 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback,
|
||||||
msg = _LE('An interface driver must be specified')
|
msg = _LE('An interface driver must be specified')
|
||||||
LOG.error(msg)
|
LOG.error(msg)
|
||||||
raise SystemExit(1)
|
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:
|
if self.conf.ipv6_gateway:
|
||||||
# ipv6_gateway configured. Check for valid v6 link-local address.
|
# ipv6_gateway configured. Check for valid v6 link-local address.
|
||||||
|
|
Loading…
Reference in New Issue