openstack
/
compute-hyperv
Code Issues Proposed changes

Merge "Driver interface updates"

This commit is contained in:
Zuul 2022-01-31 08:39:28 +00:00 committed by Gerrit Code Review
parent 64ff00727e 74c6d24e29
commit 6143a64329
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compute_hyperv/nova/cluster/driver.py
View File

@ -48,7 +48,7 @@ class HyperVClusterDriver(driver.HyperVDriver):
self._clops.add_to_cluster(instance)
def destroy(self, context, instance, network_info, block_device_info=None,
destroy_disks=True):
destroy_disks=True, destroy_secrets=True):
self._clops.remove_from_cluster(instance)
super(HyperVClusterDriver, self).destroy(
context, instance, network_info, block_device_info,

9
compute_hyperv/nova/driver.py
View File

@ -160,10 +160,6 @@ class HyperVDriver(driver.ComputeDriver):
'has been deprecated In Queens, and will be removed '
'in Rocky.')
@property
def need_legacy_block_device_info(self):
return False
def init_host(self, host):
self._serialconsoleops.start_console_handlers()
@ -199,12 +195,13 @@ class HyperVDriver(driver.ComputeDriver):
self._vmops.reboot(instance, network_info, reboot_type)
def destroy(self, context, instance, network_info, block_device_info=None,
destroy_disks=True):
destroy_disks=True, destroy_secrets=True):
self._vmops.destroy(instance, network_info, block_device_info,
destroy_disks)
def cleanup(self, context, instance, network_info, block_device_info=None,
destroy_disks=True, migrate_data=None, destroy_vifs=True):
destroy_disks=True, migrate_data=None, destroy_vifs=True,
destroy_secrets=True):
"""Cleanup after instance being destroyed by Hypervisor."""
self.unplug_vifs(instance, network_info)