openstack
/
nova
Code Issues Proposed changes

Merge "Remove dead parameter from '_create_domain_and_network'"

This commit is contained in:
Zuul 2017-12-23 16:52:18 +00:00 committed by Gerrit Code Review
parent ab1533d607 683aa147a4
commit 66440c5def
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/tests/unit/virt/libvirt/test_driver.py
View File

@ -10806,7 +10806,7 @@ class LibvirtConnTestCase(test.NoDBTestCase,
def fake_create_domain_and_network(
context, xml, instance, network_info,
block_device_info=None, power_on=True, reboot=False,
block_device_info=None, power_on=True,
vifs_already_plugged=False, post_xml_callback=None,
destroy_disks_on_failure=False):
# The config disk should be created by this callback, so we need

5
nova/virt/libvirt/driver.py
View File

@ -5176,8 +5176,7 @@ class LibvirtDriver(driver.ComputeDriver):
destroy_disks=destroy_disks)
def _create_domain_and_network(self, context, xml, instance, network_info,
block_device_info=None,
power_on=True, reboot=False,
block_device_info=None, power_on=True,
vifs_already_plugged=False,
post_xml_callback=None,
destroy_disks_on_failure=False):
@ -5189,7 +5188,7 @@ class LibvirtDriver(driver.ComputeDriver):
for vol in block_device_mapping:
connection_info = vol['connection_info']
if (not reboot and 'data' in connection_info and
if ('data' in connection_info and
'volume_id' in connection_info['data']):
volume_id = connection_info['data']['volume_id']
encryption = encryptors.get_encryption_metadata(