openstack/ironic
Code Issues Proposed changes

Merge "Remove default option from create iso image"

Browse Source
This commit is contained in:
Zuul 2021-11-26 13:56:25 +00:00 committed by Gerrit Code Review
commit 04c45f88a5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ironic/common/images.py
View File

@ -239,7 +239,7 @@ def create_isolinux_image_for_bios(
try: try:
utils.execute('mkisofs', '-r', '-V', _label(files_info), utils.execute('mkisofs', '-r', '-V', _label(files_info),
'-cache-inodes', '-J', '-l', '-no-emul-boot', '-J', '-l', '-no-emul-boot',
'-boot-load-size', '4', '-boot-info-table', '-boot-load-size', '4', '-boot-info-table',
'-b', ISOLINUX_BIN, '-o', output_file, tmpdir) '-b', ISOLINUX_BIN, '-o', output_file, tmpdir)
except processutils.ProcessExecutionError as e: except processutils.ProcessExecutionError as e:

2
ironic/tests/unit/common/test_images.py
View File

@ -638,7 +638,7 @@ class FsImageTestCase(base.TestCase):
write_to_file_mock.assert_called_once_with(cfg_file, cfg) write_to_file_mock.assert_called_once_with(cfg_file, cfg)
execute_mock.assert_called_once_with( execute_mock.assert_called_once_with(
'mkisofs', '-r', '-V', 'mkisofs', '-r', '-V',
"VMEDIA_BOOT_ISO", '-cache-inodes', '-J', '-l', "VMEDIA_BOOT_ISO", '-J', '-l',
'-no-emul-boot', '-boot-load-size', '-no-emul-boot', '-boot-load-size',
'4', '-boot-info-table', '-b', 'isolinux/isolinux.bin', '4', '-boot-info-table', '-b', 'isolinux/isolinux.bin',
'-o', 'tgt_file', 'tmpdir') '-o', 'tgt_file', 'tmpdir')