openstack/ironic
Code Issues Proposed changes

Merge "devstack: Remove syslinux dependency"

Browse Source
This commit is contained in:
Zuul 2019-04-16 15:15:03 +00:00 committed by Gerrit Code Review
commit cd27c7af05
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devstack/files/debs/ironic
View File

@ -28,7 +28,6 @@ qemu-kvm
qemu-utils qemu-utils
sgabios sgabios
shellinabox shellinabox
syslinux # dist:xenial,bionic
syslinux-common # dist:xenial,bionic syslinux-common # dist:xenial,bionic
tftpd-hpa tftpd-hpa
xinetd xinetd

8
devstack/lib/ironic
View File

@ -1038,8 +1038,12 @@ function configure_ironic_dirs {
fi fi
# Copy PXE binary # Copy PXE binary
cp $IRONIC_PXE_BOOT_IMAGE $IRONIC_TFTPBOOT_DIR # NOTE(mjturek): The PXE binary is x86_64 specific. So it should only be copied when
setup_syslinux_modules # deploying to an x86_64 node.
if [[ $IRONIC_HW_ARCH == "x86_64" ]]; then
cp $IRONIC_PXE_BOOT_IMAGE $IRONIC_TFTPBOOT_DIR
setup_syslinux_modules
fi
if [[ "$IRONIC_BOOT_MODE" == "uefi" ]]; then if [[ "$IRONIC_BOOT_MODE" == "uefi" ]]; then
local uefi_ipxe_boot_file local uefi_ipxe_boot_file