Ironic: pass injected files through to configdrive

When building the configdrive, we weren't passing the injected_files
parameter from spawn() through to the configdrive generator. Fix it.

Closes-Bug: #1447249
Change-Id: I090d2ba5774031a5b36ce51a6b6b91b823319bf1
This commit is contained in:
Jim Rollenhagen 2015-04-22 09:38:06 -07:00
parent 9d2c0c2c21
commit 7471b5a092
2 changed files with 3 additions and 2 deletions

View File

@ -684,7 +684,7 @@ class IronicDriverTestCase(test.NoDBTestCase):
self._test_spawn()
# assert configdrive was generated
mock_configdrive.assert_called_once_with(mock.ANY, mock.ANY, mock.ANY,
extra_md={})
extra_md={}, files=[])
@mock.patch.object(configdrive, 'required_by')
@mock.patch.object(loopingcall, 'FixedIntervalLoopingCall')

View File

@ -703,7 +703,8 @@ class IronicDriver(virt_driver.ComputeDriver):
extra_md['admin_pass'] = admin_password
configdrive_value = self._generate_configdrive(
instance, node, network_info, extra_md=extra_md)
instance, node, network_info, extra_md=extra_md,
files=injected_files)
LOG.info(_LI("Config drive for instance %(instance)s on "
"baremetal node %(node)s created."),