From d55ee5a55e228a57e326fca1e9412cbb828556e6 Mon Sep 17 00:00:00 2001 From: Jim Rollenhagen Date: Wed, 22 Apr 2015 09:38:06 -0700 Subject: [PATCH] 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 (cherry picked from commit 7471b5a0924c8cb90b94ea122967b422d35d9c69) --- nova/tests/unit/virt/ironic/test_driver.py | 2 +- nova/virt/ironic/driver.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nova/tests/unit/virt/ironic/test_driver.py b/nova/tests/unit/virt/ironic/test_driver.py index b3c3cc2b7b74..b19c6eb2e77a 100644 --- a/nova/tests/unit/virt/ironic/test_driver.py +++ b/nova/tests/unit/virt/ironic/test_driver.py @@ -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') diff --git a/nova/virt/ironic/driver.py b/nova/virt/ironic/driver.py index 8c46192059df..9fed9877c5e9 100644 --- a/nova/virt/ironic/driver.py +++ b/nova/virt/ironic/driver.py @@ -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."),