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

2013-11-30 00:45:27 +00:00
parent 94522f3ff2 c61bc3c3b6
commit 271e21868b
1 changed files with 1 additions and 1 deletions
--- a/nova/conductor/manager.py
+++ b/nova/conductor/manager.py
@@ -659,7 +659,7 @@ class ComputeTaskManager(base.Base):
                               block_migration, disk_over_commit)
        elif not live and not rebuild and flavor:
            instance_uuid = instance['uuid']
-            with compute_utils.EventReporter(context, ConductorManager(),
+            with compute_utils.EventReporter(context, self.db,
                                         'cold_migrate', instance_uuid):
                self._cold_migrate(context, instance, flavor,
                                   scheduler_hint['filter_properties'],