diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py index a28df59ecbdb..b5405211fc7f 100644 --- a/nova/tests/unit/virt/libvirt/test_driver.py +++ b/nova/tests/unit/virt/libvirt/test_driver.py @@ -27934,7 +27934,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) self.assertTrue(hv.evmcs) diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 804aef22b4d1..6d97808c96e8 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -6227,7 +6227,6 @@ class LibvirtDriver(driver.ComputeDriver): hv.synic = True hv.reset = True hv.frequencies = True - hv.reenlightenment = True hv.tlbflush = True hv.ipi = True hv.evmcs = True