summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-07-23 20:55:58 +0000
committerGerrit Code Review <review@openstack.org>2012-07-23 20:55:58 +0000
commit9b653109bb4cc83b610ca0eeb404b991157f3c9e (patch)
tree236ee08815e11df22ec723d695929164ee439f4d /nova
parent7d0758b2f355d5b086b2ea1e9d6b7b7838b3a157 (diff)
parent109a4321d4488cd8a6c3be8b8cfcb7baad819de6 (diff)
downloadnova-9b653109bb4cc83b610ca0eeb404b991157f3c9e.tar.gz
nova-9b653109bb4cc83b610ca0eeb404b991157f3c9e.tar.xz
nova-9b653109bb4cc83b610ca0eeb404b991157f3c9e.zip
Merge "Log snapshot UUID and not OpaqueRef."
Diffstat (limited to 'nova')
-rw-r--r--nova/virt/xenapi/vm_utils.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 601453ff3..22a0e4990 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -487,10 +487,8 @@ def snapshot_attached_here(session, instance, vm_ref, label):
def _create_snapshot(session, instance, vm_ref, label):
"""Creates Snapshot (Template) VM, Snapshot VBD, Snapshot VDI,
- Snapshot VHD"""
- LOG.debug(_("Snapshotting with label '%(label)s'"), locals(),
- instance=instance)
-
+ Snapshot VHD
+ """
vm_vdi_ref, vm_vdi_rec = get_vdi_for_vm_safely(session, vm_ref)
original_parent_uuid = _get_vhd_parent_uuid(session, vm_vdi_ref)
@@ -499,8 +497,8 @@ def _create_snapshot(session, instance, vm_ref, label):
template_vdi_rec = get_vdi_for_vm_safely(session, template_vm_ref)[1]
template_vdi_uuid = template_vdi_rec["uuid"]
- LOG.debug(_('Created snapshot %(template_vm_ref)s'), locals(),
- instance=instance)
+ LOG.debug(_("Created snapshot %(template_vdi_uuid)s with label"
+ " '%(label)s'"), locals(), instance=instance)
sr_ref = vm_vdi_rec["SR"]
parent_uuid, base_uuid = _wait_for_vhd_coalesce(