From 3e2b15f0d622d05cd1710f08728577122aeb5a5c Mon Sep 17 00:00:00 2001 From: Brian Haley Date: Wed, 1 Apr 2020 20:51:32 -0400 Subject: [PATCH] Add tunnel_ip_version to tunnel_sync() error message Just to make it clear in the message, add the tunnel_ip_version config option in the error message, else the user has to consult the startup message to know what the value is set to. Trivialfix Change-Id: Ic8d8b0d454e8202d1bfae52b77137eb9071508da --- neutron/plugins/ml2/drivers/type_tunnel.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/neutron/plugins/ml2/drivers/type_tunnel.py b/neutron/plugins/ml2/drivers/type_tunnel.py index f292458b88a..6a069481cf8 100644 --- a/neutron/plugins/ml2/drivers/type_tunnel.py +++ b/neutron/plugins/ml2/drivers/type_tunnel.py @@ -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')