diff options
| author | Stephen Finucane <sfinucan@redhat.com> | 2019-11-25 11:01:08 +0000 |
|---|---|---|
| committer | Stephen Finucane <sfinucan@redhat.com> | 2019-11-29 17:20:02 +0000 |
| commit | 5ecfa674082920356b844e861e4ca3edfe66e98e (patch) | |
| tree | f5bed1332e5d772b824cc0667852a14e0e7c76cd /nova/virt/hyperv/vmops.py | |
| parent | 913679d7e35787023791eea0678738b3e0fe4b65 (diff) | |
| download | nova-5ecfa674082920356b844e861e4ca3edfe66e98e.tar.gz | |
hyperv: Remove vestigial nova-network support
Remove the last few references to nova-net from the Hyper-V driver,
simplifying some of the code in the process.
Change-Id: I170d57f834e0a0e2b373eb98a15c52a052a6bce1
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
Diffstat (limited to 'nova/virt/hyperv/vmops.py')
| -rw-r--r-- | nova/virt/hyperv/vmops.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nova/virt/hyperv/vmops.py b/nova/virt/hyperv/vmops.py index cecf28d649..356e6fc07e 100644 --- a/nova/virt/hyperv/vmops.py +++ b/nova/virt/hyperv/vmops.py @@ -41,7 +41,6 @@ from nova import exception from nova.i18n import _ from nova import objects from nova.objects import fields -from nova import utils from nova.virt import configdrive from nova.virt import hardware from nova.virt.hyperv import block_device_manager @@ -345,11 +344,11 @@ class VMOps(object): # already up will not undergo that transition, and for # anything that might be stale (cache-wise) assume it's # already up so we don't block on it. - if utils.is_neutron() and CONF.vif_plugging_timeout: + if CONF.vif_plugging_timeout: return [('network-vif-plugged', vif['id']) for vif in network_info if vif.get('active') is False] - else: - return [] + + return [] def create_instance(self, instance, network_info, root_device, block_device_info, vm_gen, image_meta): |