From: Andreas Scheuring Date: Mon, 7 Dec 2015 12:42:21 +0000 (+0100) Subject: lb: Correct String formatting to get rid of logged ValueError X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1f86d8687b2781f0c287ee656f3cbc65aaa4b5e4;p=openstack-build%2Fneutron-build.git lb: Correct String formatting to get rid of logged ValueError The following error is caused by a missing String formatting in the linuxbridge agent: "ValueError: unsupported format character 'a' (0x61) at index 90 Logged from file linuxbridge_neutron_agent.py, line 447" In addition a duplicated word in the log text has been fixed. Change-Id: I587f1165fc7084dc9c4806149b65652f6e27b14e --- diff --git a/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py b/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py index 7070ec0a3..00fc6ac3f 100644 --- a/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py +++ b/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py @@ -442,9 +442,8 @@ class LinuxBridgeManager(object): 'device_owner': device_owner, 'bridge_name': bridge_name} LOG.debug("Skip adding device %(tap_device_name)s to " - "%(bridge_name)s. It is owned by %(device_owner) and " - "thus added elsewhere." - "elsewhere", data) + "%(bridge_name)s. It is owned by %(device_owner)s and " + "thus added elsewhere.", data) return True def ensure_tap_mtu(self, tap_dev_name, phy_dev_name):