diff options
| author | John Garbutt <john.garbutt@rackspace.com> | 2016-09-12 13:50:36 +0100 |
|---|---|---|
| committer | John Garbutt <john.garbutt@rackspace.com> | 2016-09-12 15:25:13 +0100 |
| commit | 2ba8fd42901c49a698b8f85f6d8058ce606380d8 (patch) | |
| tree | 38d42687faeb4a3ab5c876f975dc133ab6369fdd /nova/virt/libvirt/driver.py | |
| parent | dee72f44fe9d06f5d99b4afdf93a6b043a46ecdf (diff) | |
| download | nova-2ba8fd42901c49a698b8f85f6d8058ce606380d8.tar.gz | |
Revert "libvirt: move graphic/serial consoles check to pre_live_migration"
This reverts the key bits of commit
917afd2831be8107177f50f277e400e03f896f74.
Change-Id: I0425b254595371eaa618b10d8c81520b0f6018a5
Related-Bug: #1615613
Diffstat (limited to 'nova/virt/libvirt/driver.py')
| -rw-r--r-- | nova/virt/libvirt/driver.py | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 56c7a9417e..2299aeba86 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -5409,16 +5409,6 @@ class LibvirtDriver(driver.ComputeDriver): md_obj.from_legacy_dict(dest_check_data) dest_check_data = md_obj - listen_addrs = libvirt_migrate.graphics_listen_addrs( - dest_check_data) - migratable_flag = self._host.is_migratable_xml_flag() - if not migratable_flag or not listen_addrs: - # In this context want to ensure we do not have to migrate - # graphic or serial consoles since we can't update guest's - # domain XML to make it handle destination host. - self._check_graphics_addresses_can_live_migrate(listen_addrs) - self._verify_serial_console_is_disabled() - # Checking shared storage connectivity # if block migration, instances_paths should not be on shared storage. source = CONF.host @@ -5834,6 +5824,17 @@ class LibvirtDriver(driver.ComputeDriver): listen_addrs = libvirt_migrate.graphics_listen_addrs( migrate_data) + + migratable_flag = self._host.is_migratable_xml_flag() + if not migratable_flag or not listen_addrs: + # In this context want to ensure we do not have to migrate + # graphic or serial consoles since we can't update guest's + # domain XML to make it handle destination host. + # TODO(alexs-h): These checks could be moved to the + # check_can_live_migrate_destination/source phase + self._check_graphics_addresses_can_live_migrate(listen_addrs) + self._verify_serial_console_is_disabled() + if ('target_connect_addr' in migrate_data and migrate_data.target_connect_addr is not None): dest = migrate_data.target_connect_addr |