openstack
/
nova
Code Issues Proposed changes

Merge "Fixes Hyper-V configdrive network injection issue" into stable/juno

This commit is contained in:
Jenkins 2015-03-17 16:52:05 +00:00 committed by Gerrit Code Review
parent d6683ba1b1 40b19d92ad
commit 91df3870f8
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nova/tests/virt/hyperv/test_hypervapi.py
View File

@ -415,7 +415,8 @@ class HyperVAPITestCase(HyperVAPIBaseTestCase):
def _setup_spawn_config_drive_mocks(self, use_cdrom):
instance_metadata.InstanceMetadata(mox.IgnoreArg(),
content=mox.IsA(list),
extra_md=mox.IsA(dict))
extra_md=mox.IsA(dict),
network_info=mox.IsA(list))
m = fake.PathUtils.get_instance_dir(mox.IsA(str))
m.AndReturn(self._test_instance_dir)

10
nova/virt/hyperv/vmops.py
View File

@ -278,7 +278,9 @@ class VMOps(object):
if configdrive.required_by(instance):
configdrive_path = self._create_config_drive(instance,
injected_files,
admin_password)
admin_password,
network_info)
self.attach_config_drive(instance, configdrive_path)
self.power_on(instance)
@ -331,7 +333,8 @@ class VMOps(object):
self._create_vm_com_port_pipe(instance)
def _create_config_drive(self, instance, injected_files, admin_password):
def _create_config_drive(self, instance, injected_files, admin_password,
network_info):
if CONF.config_drive_format != 'iso9660':
raise vmutils.UnsupportedConfigDriveFormatException(
_('Invalid config_drive_format "%s"') %
@ -345,7 +348,8 @@ class VMOps(object):
inst_md = instance_metadata.InstanceMetadata(instance,
content=injected_files,
extra_md=extra_md)
extra_md=extra_md,
network_info=network_info)
instance_path = self._pathutils.get_instance_dir(
instance['name'])