diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-04-23 14:44:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-04-23 14:44:14 +0000 |
| commit | bb11b3cd0c839618d9ab4abe375b1f54c177ddc2 (patch) | |
| tree | 0eeb797c5b9f4b9e707e5ded2e7af4b89e0ea8b9 | |
| parent | dd37492d3d94792e30c77e900ae317832cb43a3d (diff) | |
| parent | 576b21ff9d88d4493ada644b160513a0087e0b48 (diff) | |
| download | nova-bb11b3cd0c839618d9ab4abe375b1f54c177ddc2.tar.gz nova-bb11b3cd0c839618d9ab4abe375b1f54c177ddc2.tar.xz nova-bb11b3cd0c839618d9ab4abe375b1f54c177ddc2.zip | |
Merge "Log instance consistently."
| -rw-r--r-- | nova/virt/libvirt/vif.py | 12 |
1 files changed, 6 insertions, 6 deletions
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 |