openstack
/
ironic
Code Issues Proposed changes

Build the new cirros image even when netboot is the default 

The standalone job changes boot_option in runtime, so local boot
can be used even when the default boot option is netboot.

Change-Id: Ia538907f3662e8cd84d988ea5d862c7f488558e1
(cherry picked from commit 7ac4804126)
This commit is contained in:
Dmitry Tantsur 2022-02-17 15:36:11 +01:00
parent a58cd13eaa
commit 6e640b336e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devstack/lib/ironic
View File

@ -2812,9 +2812,7 @@ function build_ipa_dib_ramdisk {
}
function upload_image_if_needed {
if [[ "$IRONIC_PARTITIONED_IMAGE_NAME" =~ cirros ]] \
&& [[ "$IRONIC_DEFAULT_BOOT_OPTION" == local ]] \
&& is_service_enabled glance; then
if [[ "$IRONIC_PARTITIONED_IMAGE_NAME" =~ cirros ]] && is_service_enabled glance; then
echo Building a Cirros image suitable for local boot
local dest
@ -2843,8 +2841,12 @@ function upload_image_if_needed {
--property kernel_id=$kernel_id --property ramdisk_id=$ramdisk_id \
--file "$dest"
if [[ "$IRONIC_TEMPEST_WHOLE_DISK_IMAGE" != True ]]; then
# Change the default image only if the provided settings prevent the
# default cirros image from working.
if [[ "$IRONIC_TEMPEST_WHOLE_DISK_IMAGE" != True \
&& "$IRONIC_DEFAULT_BOOT_OPTION" == local ]]; then
IRONIC_IMAGE_NAME=$IRONIC_PARTITIONED_IMAGE_NAME
DEFAULT_IMAGE_NAME=$IRONIC_IMAGE_NAME
fi
fi
}