Permalink
Browse files

Merge "xenapi: virt rescue method now supports objects"

  • Loading branch information...
2 parents 4ff26f2 + 002844d commit 134a06ef0d98d982dca7cb9d5181db4c353cf128 Jenkins committed with openstack-gerrit Jul 19, 2014
Showing with 2 additions and 2 deletions.
  1. +2 −2 nova/virt/xenapi/vmops.py
@@ -1400,11 +1400,11 @@ def rescue(self, context, instance, network_info, image_meta,
- spawn a rescue VM (the vm name-label will be instance-N-rescue).
"""
- rescue_name_label = '%s-rescue' % instance['name']
+ rescue_name_label = '%s-rescue' % instance.name
rescue_vm_ref = vm_utils.lookup(self._session, rescue_name_label)
if rescue_vm_ref:
raise RuntimeError(_("Instance is already in Rescue Mode: %s")
- % instance['name'])
+ % instance.name)
vm_ref = self._get_vm_opaque_ref(instance)
vm_utils.hard_shutdown_vm(self._session, instance, vm_ref)

0 comments on commit 134a06e

Please sign in to comment.