diff options
| author | Nguyen Van Trung <trungnv@vn.fujitsu.com> | 2018-08-08 16:16:05 +0700 |
|---|---|---|
| committer | Nguyen Van Trung <trungnv@vn.fujitsu.com> | 2018-08-09 17:27:11 +0700 |
| commit | 546a115239e506769ff5b8983bee08c148679053 (patch) | |
| tree | 882246317ba47c07c260f2c9c33bf984004d6767 /ironic/drivers/modules/irmc | |
| parent | 989f87077847eef762e922bfe43ec44708404b91 (diff) | |
| download | ironic-546a115239e506769ff5b8983bee08c148679053.tar.gz | |
Fix not exist deploy image within irmc-virtual-media booting
With partition image, this change will fetch the deploy image
before boot image creating.
Change-Id: I1ffd5c3af0f499a1bef663b01b636d3ecbb9a53d
Story: #2003338
Task: #24376
Diffstat (limited to 'ironic/drivers/modules/irmc')
| -rw-r--r-- | ironic/drivers/modules/irmc/boot.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ironic/drivers/modules/irmc/boot.py b/ironic/drivers/modules/irmc/boot.py index 90fc8e46b..901a561b7 100644 --- a/ironic/drivers/modules/irmc/boot.py +++ b/ironic/drivers/modules/irmc/boot.py @@ -287,9 +287,7 @@ def _prepare_boot_iso(task, root_uuid): ramdisk_href = (task.node.instance_info.get('ramdisk') or image_properties['ramdisk_id']) - deploy_iso_filename = _get_iso_name(task.node, label='deploy') - deploy_iso = ('file://' + os.path.join( - CONF.irmc.remote_image_share_root, deploy_iso_filename)) + deploy_iso_href = deploy_info['irmc_deploy_iso'] boot_mode = boot_mode_utils.get_boot_mode_for_deploy(task.node) kernel_params = CONF.pxe.pxe_append_params @@ -299,7 +297,7 @@ def _prepare_boot_iso(task, root_uuid): images.create_boot_iso(task.context, boot_iso_fullpathname, kernel_href, ramdisk_href, - deploy_iso, root_uuid, + deploy_iso_href, root_uuid, kernel_params, boot_mode) driver_internal_info['irmc_boot_iso'] = boot_iso_filename |