Merge "resync: small differences"

hyperv/nova/driver.py

@@ -98,7 +98,8 @@ class HyperVDriver(driver.ComputeDriver):
     capabilities = {
         "has_imagecache": True,
         "supports_recreate": False,
-        "supports_migrate_to_same_host": True
+        "supports_migrate_to_same_host": True,
+        "supports_attach_interface": True
     }
 
     def __init__(self, virtapi):

hyperv/nova/livemigrationops.py

@@ -92,6 +92,8 @@ class LiveMigrationOps(object):
         disk_path_mapping = self._volumeops.get_disk_path_mapping(
             block_device_info, block_dev_only=True)
         if disk_path_mapping:
+            # We create a planned VM, ensuring that volumes will remain
+            # attached after the VM is migrated.
             self._livemigrutils.create_planned_vm(instance.name,
                                                   instance.host,
                                                   disk_path_mapping)