diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py index c524f7c2d6..5afd87e08d 100644 --- a/nova/tests/unit/virt/libvirt/test_driver.py +++ b/nova/tests/unit/virt/libvirt/test_driver.py @@ -28048,7 +28048,9 @@ class LibvirtDriverTestCase(test.NoDBTestCase, TraitsComparisonMixin): self.assertTrue(hv.synic) self.assertTrue(hv.reset) self.assertTrue(hv.frequencies) - self.assertTrue(hv.reenlightenment) + # NOTE(jie) reenlightenment will cause instances live-migration + # failure, so don't enable it now. See bug 2046549. + self.assertFalse(hv.reenlightenment) self.assertTrue(hv.tlbflush) self.assertTrue(hv.ipi) # NOTE(artom) evmcs only works on Intel hosts, so we can't enable it diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index a7e7a77185..f56bc7d057 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -6262,7 +6262,6 @@ class LibvirtDriver(driver.ComputeDriver): hv.synic = True hv.reset = True hv.frequencies = True - hv.reenlightenment = True hv.tlbflush = True hv.ipi = True