diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 6d69fba..611ffbb 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -1849,15 +1849,19 @@ class ComputeManager(manager.SchedulerDependentManager):
             network_info=network_info)
 
         bdms = self._get_instance_volume_bdms(context, instance['uuid'])
-        block_device_info = self._get_instance_volume_block_device_info(
-                            context, instance['uuid'], bdms=bdms)
 
         if bdms:
             connector = self.driver.get_volume_connector(instance)
             for bdm in bdms:
                 volume = self.volume_api.get(context, bdm['volume_id'])
-                self.volume_api.initialize_connection(context, volume,
-                                                      connector)
+                cinfo = self.volume_api.initialize_connection(context, volume,
+                                                              connector)
+                self.db.block_device_mapping_update(
+                    context, bdm['id'],
+                    {'connection_info': jsonutils.dumps(cinfo)})
+
+        block_device_info = self._get_instance_volume_block_device_info(
+                            context, instance['uuid'])
 
         self.driver.finish_migration(context, migration, instance,
                                      disk_info,