diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-26 18:47:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-26 18:47:22 +0000 |
| commit | ab77c4e1b8e4c500a9372e290e658952a2441627 (patch) | |
| tree | 29ce3faf2c4a01de9576384a3bb3a313c18398f3 /nova/virt | |
| parent | 9adc3a456a4a38fd9e372ddd7ee2fc6abeddbb0d (diff) | |
| parent | 717c9755805aa06340130b6bc4e7de8f81ea8e57 (diff) | |
Merge "Make compute manager use nova-conductor for instance_update"
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/xenapi/host.py | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/nova/virt/xenapi/host.py b/nova/virt/xenapi/host.py index 8057f0542..e893abf4f 100644 --- a/nova/virt/xenapi/host.py +++ b/nova/virt/xenapi/host.py @@ -85,33 +85,27 @@ class Host(object): dest = _host_find(ctxt, self._session, aggregate[0], host_ref) - (old_ref, new_ref) = self._virtapi.instance_update( - ctxt, - instance['uuid'], - {'host': dest, - 'task_state': task_states.MIGRATING}) - notifications.send_update(ctxt, old_ref, new_ref) + self._virtapi.instance_update( + ctxt, instance['uuid'], + {'host': dest, + 'task_state': task_states.MIGRATING}) self._session.call_xenapi('VM.pool_migrate', vm_ref, host_ref, {}) migrations_counter = migrations_counter + 1 - (old_ref, new_ref) = self._virtapi.instance_update( - ctxt, - instance['uuid'], - {'vm_state': vm_states.ACTIVE}) - notifications.send_update(ctxt, old_ref, new_ref) + self._virtapi.instance_update( + ctxt, instance['uuid'], + {'vm_state': vm_states.ACTIVE}) break except self._session.XenAPI.Failure: LOG.exception(_('Unable to migrate VM %(vm_ref)s' - 'from %(host)s') % locals()) - (old_ref, new_ref) = self._virtapi.instance_update( - ctxt, - instance['uuid'], - {'host': host, - 'vm_state': vm_states.ACTIVE}) - notifications.send_update(ctxt, old_ref, new_ref) + 'from %(host)s') % locals()) + self._virtapi.instance_update( + ctxt, instance['uuid'], + {'host': host, + 'vm_state': vm_states.ACTIVE}) if vm_counter == migrations_counter: return 'on_maintenance' |