openstack/nova
Code Issues Proposed changes

Merge "Change ConductorManager to self.db when record cold_migrate event"

Browse Source
This commit is contained in:
Jenkins
2013-11-30 00:45:27 +00:00
committed by Gerrit Code Review
parent 94522f3ff2 c61bc3c3b6
commit 271e21868b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova/conductor/manager.py
View File

@@ -659,7 +659,7 @@ class ComputeTaskManager(base.Base):
block_migration, disk_over_commit) block_migration, disk_over_commit)
elif not live and not rebuild and flavor: elif not live and not rebuild and flavor:
instance_uuid = instance['uuid'] instance_uuid = instance['uuid']
with compute_utils.EventReporter(context, ConductorManager(), with compute_utils.EventReporter(context, self.db,
'cold_migrate', instance_uuid): 'cold_migrate', instance_uuid):
self._cold_migrate(context, instance, flavor, self._cold_migrate(context, instance, flavor,
scheduler_hint['filter_properties'], scheduler_hint['filter_properties'],