openstack/ironic
Code Issues Proposed changes

Merge "Fix EFIBOOT image upload in devstack"

Browse Source
This commit is contained in:
Zuul 2019-10-18 10:20:42 +00:00 committed by Gerrit Code Review
commit 6a054eb692
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devstack/lib/ironic
View File

@ -943,7 +943,7 @@ function configure_redfish {
cat - <<EOF > $IRONIC_REDFISH_EMULATOR_CONFIG cat - <<EOF > $IRONIC_REDFISH_EMULATOR_CONFIG
SUSHY_EMULATOR_BOOT_LOADER_MAP = { SUSHY_EMULATOR_BOOT_LOADER_MAP = {
'Uefi': { 'UEFI': {
'x86_64': '$UEFI_LOADER_PATH' 'x86_64': '$UEFI_LOADER_PATH'
}, },
'Legacy': { 'Legacy': {
@ -2580,6 +2580,9 @@ function upload_baremetal_ironic_efiboot {
sudo umount $efiboot_mount sudo umount $efiboot_mount
mv $efiboot_path $IRONIC_EFIBOOT
fi
# load efiboot into glance # load efiboot into glance
IRONIC_EFIBOOT_ID=$(openstack \ IRONIC_EFIBOOT_ID=$(openstack \
image create \ image create \
@ -2587,13 +2590,10 @@ function upload_baremetal_ironic_efiboot {
--public --disk-format=raw \ --public --disk-format=raw \
--container-format=bare \ --container-format=bare \
-f value -c id \ -f value -c id \
< $efiboot_path) < $IRONIC_EFIBOOT)
die_if_not_set $LINENO IRONIC_EFIBOOT_ID "Failed to load EFI bootloader image into glance" die_if_not_set $LINENO IRONIC_EFIBOOT_ID "Failed to load EFI bootloader image into glance"
mv $efiboot_path $IRONIC_EFIBOOT
iniset $IRONIC_CONF_FILE conductor bootloader $IRONIC_EFIBOOT_ID iniset $IRONIC_CONF_FILE conductor bootloader $IRONIC_EFIBOOT_ID
fi
} }
# build deploy kernel+ramdisk, then upload them to glance # build deploy kernel+ramdisk, then upload them to glance