openstack
/
nova
Code Issues Proposed changes

Merge "Compute: use dot convension for _poll_rescued_instances"

This commit is contained in:
Jenkins 2015-02-12 12:55:21 +00:00 committed by Gerrit Code Review
parent 4b9adef231 32e268ccaf
commit a4f9c1b9f4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/compute/manager.py
View File

@ -5518,7 +5518,7 @@ class ComputeManager(manager.Manager):
instance_uuid)
_set_migration_to_error(migration, reason)
continue
if instance['vm_state'] == vm_states.ERROR:
if instance.vm_state == vm_states.ERROR:
reason = _("In ERROR state")
_set_migration_to_error(migration, reason,
instance=instance)
@ -5544,8 +5544,8 @@ class ComputeManager(manager.Manager):
LOG.debug(msg, instance=instance)
continue
vm_state = instance['vm_state']
task_state = instance['task_state']
vm_state = instance.vm_state
task_state = instance.task_state
if vm_state != vm_states.RESIZED or task_state is not None:
reason = (_("In states %(vm_state)s/%(task_state)s, not "
"RESIZED/None") %