diff options
| author | Ilya Etingof <etingof@gmail.com> | 2018-11-26 19:48:07 +0100 |
|---|---|---|
| committer | Ilya Etingof <etingof@gmail.com> | 2019-01-23 09:46:01 +0100 |
| commit | 738d4eafdc371220b59a48cab9b981e7c3da86cf (patch) | |
| tree | 67bd4decd4a66421e1bb8b0b3c4276f05772b064 /ironic/drivers | |
| parent | 53823d7f9376cedb9fe794bc46aa69275157448a (diff) | |
| download | ironic-738d4eafdc371220b59a48cab9b981e7c3da86cf.tar.gz | |
Build ISO out of EFI system partition image
When ironic builds UEFI-bootable ISO image, it extracts
EFI system partition image (`efiboot.img`) from the
`deploy_iso` ISO image.
This change allows supplying EFI system partition image to
the ISO image building routines in form of a local file or
UUID or URI reference.
The motivation behind this change is to make UEFI-bootable image
building process more efficient and functional. This change is
thought of as a prerequisite for the upcoming Redfish-based
virtual media boot feature.
Story: 1526753
Task: 28098
Change-Id: Idf912ff2146434b666fdb4250dc1ecad39bc5a04
Diffstat (limited to 'ironic/drivers')
| -rw-r--r-- | ironic/drivers/modules/ilo/boot.py | 6 | ||||
| -rw-r--r-- | ironic/drivers/modules/irmc/boot.py | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/ironic/drivers/modules/ilo/boot.py b/ironic/drivers/modules/ilo/boot.py index 670c65d95..557a8d257 100644 --- a/ironic/drivers/modules/ilo/boot.py +++ b/ironic/drivers/modules/ilo/boot.py @@ -198,8 +198,10 @@ def _get_boot_iso(task, root_uuid): boot_iso_tmp_file = fileobj.name images.create_boot_iso(task.context, boot_iso_tmp_file, kernel_href, ramdisk_href, - deploy_iso_uuid, root_uuid, - kernel_params, boot_mode) + deploy_iso_href=deploy_iso_uuid, + root_uuid=root_uuid, + kernel_params=kernel_params, + boot_mode=boot_mode) if CONF.ilo.use_web_server_for_images: boot_iso_url = ( diff --git a/ironic/drivers/modules/irmc/boot.py b/ironic/drivers/modules/irmc/boot.py index 4acfa0601..677f56048 100644 --- a/ironic/drivers/modules/irmc/boot.py +++ b/ironic/drivers/modules/irmc/boot.py @@ -314,8 +314,10 @@ def _prepare_boot_iso(task, root_uuid): images.create_boot_iso(task.context, boot_iso_fullpathname, kernel_href, ramdisk_href, - deploy_iso_href, root_uuid, - kernel_params, boot_mode) + deploy_iso_href=deploy_iso_href, + root_uuid=root_uuid, + kernel_params=kernel_params, + boot_mode=boot_mode) driver_internal_info['irmc_boot_iso'] = boot_iso_filename |