summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Still <mikal@stillhq.com>2012-04-12 12:40:13 +1000
committerMichael Still <mikal@stillhq.com>2012-04-21 03:26:23 +1000
commitfe4dce7fb5a43b62635c16bef833cf34cee6f8ca (patch)
treeb6f2ec147bf6f2a9d295a92f562c1b416a386a4b
parentca5d8fae4d92afd0f015f0e9bd0905f231bf85d3 (diff)
downloadnova-fe4dce7fb5a43b62635c16bef833cf34cee6f8ca.tar.gz
nova-fe4dce7fb5a43b62635c16bef833cf34cee6f8ca.tar.xz
nova-fe4dce7fb5a43b62635c16bef833cf34cee6f8ca.zip
Log instances consistently.
Change-Id: I9f4ab63405e7214b082e726cc9d59626ca503c66
-rw-r--r--nova/virt/libvirt/connection.py14
1 files changed, 6 insertions, 8 deletions
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 96c2b89e0..a01d96377 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -2458,8 +2458,8 @@ class LibvirtConnection(driver.ComputeDriver):
@exception.wrap_exception()
def migrate_disk_and_power_off(self, context, instance, dest,
instance_type, network_info):
- LOG.debug(_("Instance %s: Starting migrate_disk_and_power_off"),
- instance['name'])
+ LOG.debug(_("Starting migrate_disk_and_power_off"),
+ instance=instance)
disk_info_text = self.get_instance_disk_info(instance['name'])
disk_info = utils.loads(disk_info_text)
@@ -2518,15 +2518,13 @@ class LibvirtConnection(driver.ComputeDriver):
raise utils.LoopingCallDone(False)
if state == power_state.RUNNING:
- LOG.info(_("Instance running successfully."),
- instance=instance)
+ LOG.info(_("Instance running successfully."), instance=instance)
raise utils.LoopingCallDone(True)
@exception.wrap_exception()
def finish_migration(self, context, migration, instance, disk_info,
network_info, image_meta, resize_instance):
- LOG.debug(_("Instance %s: Starting finish_migration"),
- instance['name'])
+ LOG.debug(_("Starting finish_migration"), instance=instance)
# resize disks. only "disk" and "disk.local" are necessary.
disk_info = utils.loads(disk_info)
@@ -2565,8 +2563,8 @@ class LibvirtConnection(driver.ComputeDriver):
@exception.wrap_exception()
def finish_revert_migration(self, instance, network_info):
- LOG.debug(_("Instance %s: Starting finish_revert_migration"),
- instance['name'])
+ LOG.debug(_("Starting finish_revert_migration"),
+ instance=instance)
inst_base = "%s/%s" % (FLAGS.instances_path, instance['name'])
inst_base_resize = inst_base + "_resize"