openstack
/
neutron
Code Issues Proposed changes

Merge "Add tunnel_ip_version to tunnel_sync() error message"

This commit is contained in:
Zuul 2020-04-08 11:49:10 +00:00 committed by Gerrit Code Review
parent 805bd1210e 3e2b15f0d6
commit 5bf22434c4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/plugins/ml2/drivers/type_tunnel.py
View File

@ -501,8 +501,10 @@ class TunnelRpcCallbackMixin(object):
version = netaddr.IPAddress(tunnel_ip).version
if version != cfg.CONF.ml2.overlay_ip_version:
msg = (_("Tunnel IP version does not match ML2 "
"overlay_ip_version, host: %(host)s, tunnel_ip: %(ip)s"),
{'host': host, 'ip': tunnel_ip})
"overlay_ip_version: %(overlay)s, host: %(host)s, "
"tunnel_ip: %(ip)s"),
{'overlay': cfg.CONF.ml2.overlay_ip_version,
'host': host, 'ip': tunnel_ip})
raise exc.InvalidInput(error_message=msg)
tunnel_type = kwargs.get('tunnel_type')