From 576b21ff9d88d4493ada644b160513a0087e0b48 Mon Sep 17 00:00:00 2001 From: Michael Still Date: Thu, 12 Apr 2012 12:48:34 +1000 Subject: Log instance consistently. Change-Id: I5f85dcc1001e94886a14127d7517acdf4c2298be --- nova/virt/libvirt/vif.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'nova') diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py index 642ed11a9..8762ff529 100644 --- a/nova/virt/libvirt/vif.py +++ b/nova/virt/libvirt/vif.py @@ -89,14 +89,16 @@ class LibvirtBridgeDriver(vif.VIFDriver): iface = FLAGS.vlan_interface or network['bridge_interface'] LOG.debug(_('Ensuring vlan %(vlan)s and bridge %(bridge)s'), {'vlan': network['vlan'], - 'bridge': network['bridge']}) + 'bridge': network['bridge']}, + instance=instance) linux_net.LinuxBridgeInterfaceDriver.ensure_vlan_bridge( network['vlan'], network['bridge'], iface) else: iface = FLAGS.flat_interface or network['bridge_interface'] - LOG.debug(_("Ensuring bridge %s"), network['bridge']) + LOG.debug(_("Ensuring bridge %s"), network['bridge'], + instance=instance) linux_net.LinuxBridgeInterfaceDriver.ensure_bridge( network['bridge'], iface) @@ -162,8 +164,7 @@ class LibvirtOpenVswitchDriver(vif.VIFDriver): FLAGS.libvirt_ovs_bridge, dev, run_as_root=True) utils.execute('ip', 'link', 'delete', dev, run_as_root=True) except exception.ProcessExecutionError: - LOG.exception(_("Failed while unplugging vif of instance '%s'"), - instance['name']) + LOG.exception(_("Failed while unplugging vif"), instance=instance) class LibvirtOpenVswitchVirtualPortDriver(vif.VIFDriver): @@ -217,6 +218,5 @@ class QuantumLinuxBridgeVIFDriver(vif.VIFDriver): try: utils.execute('ip', 'link', 'delete', dev, run_as_root=True) except exception.ProcessExecutionError: - LOG.warning(_("Failed while unplugging vif of instance '%s'"), - instance['name']) + LOG.warning(_("Failed while unplugging vif"), instance=instance) raise -- cgit