Description of problem:
Instance hard reboots fail due to a TimeoutException being thrown waiting for vif-plugged events from Neutron when ODL or SRIOV vNICs are attached to an instance.
https://bugzilla.redhat.com/show_bug.cgi?id=1499360 introduced https://review.openstack.org/#/c/541442/ into Queens but this is currently being reverted upstream due to https://bugs.launchpad.net/nova/+bug/1755890
Version-Release number of selected component (if applicable):
How reproducible:
Always
Steps to Reproduce:
1. Hard reboot an instance with ODL/SRIOV vNICs attached.
Actual results:
Failure to hard reboot due to a TimeoutException being thrown waiting for a vif-plugged event from Neutron.
Expected results:
The hard reboot succeeds.
Additional info: