openstack/deb-ironic
Code Issues Proposed changes

Fix for broken deploy of iscsi_ilo driver

Browse Source 
This commit fixes the issue that iscsi_ilo driver fails
during deploy while creating the bootable ISO image.

Change-Id: Ib265fa49a0601985793c0f9cb1f394d05496958b
Closes-Bug: 1399522
This commit is contained in:
Ramakrishnan G
2014-12-05 13:08:57 +05:30
parent 6110667212
commit 4d7157c57d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ironic/common/images.py
View File

@@ -352,8 +352,8 @@ def create_boot_iso(context, output_filename, kernel_uuid,
with utils.tempdir() as tmpdir:
kernel_path = os.path.join(tmpdir, kernel_uuid)
ramdisk_path = os.path.join(tmpdir, ramdisk_uuid)
fetch(context, kernel_uuid, kernel_path, CONF.force_raw_images)
fetch(context, ramdisk_uuid, ramdisk_path, CONF.force_raw_images)
fetch(context, kernel_uuid, kernel_path)
fetch(context, ramdisk_uuid, ramdisk_path)
params = []
if root_uuid:

4
ironic/tests/test_images.py
View File

@@ -432,9 +432,9 @@ class FsImageTestCase(base.TestCase):
'ramdisk-uuid', 'root-uuid', 'kernel-params')
fetch_images_mock.assert_any_call('ctx', 'kernel-uuid',
'tmpdir/kernel-uuid', True)
'tmpdir/kernel-uuid')
fetch_images_mock.assert_any_call('ctx', 'ramdisk-uuid',
'tmpdir/ramdisk-uuid', True)
'tmpdir/ramdisk-uuid')
params = ['root=UUID=root-uuid', 'kernel-params']
create_isolinux_mock.assert_called_once_with('output_file',
'tmpdir/kernel-uuid', 'tmpdir/ramdisk-uuid', params)