openstack
/
ironic
Code Issues Proposed changes

Merge "Ensure `isolinux.bin` is present and configured in devstack"

This commit is contained in:
Zuul 2019-11-20 05:06:40 +00:00 committed by Gerrit Code Review
parent 6582471c05 1e25f60fd3
commit 0ee99def0b
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devstack/files/debs/ironic
View File

@ -15,6 +15,7 @@ docker.io
ipmitool
iptables
ipxe
isolinux
gnupg
libguestfs0
libguestfs-tools

1
devstack/files/rpms/ironic
View File

@ -14,6 +14,7 @@ openvswitch
sgabios
shellinabox
syslinux
syslinux-nonlinux
tftp-server
xinetd
squashfs-tools

5
devstack/lib/ironic
View File

@ -1566,6 +1566,11 @@ function configure_ironic_conductor {
iniset $IRONIC_CONF_FILE dhcp dhcp_provider $IRONIC_DHCP_PROVIDER
iniset $IRONIC_CONF_FILE deploy default_boot_option $IRONIC_DEFAULT_BOOT_OPTION
isolinux=$(find -L /usr /opt /etc -type f -name "isolinux.bin" | head -1)
if [[ -n "$isolinux" ]]; then
iniset $IRONIC_CONF_FILE DEFAULT isolinux_bin "$isolinux"
fi
}
# create_ironic_cache_dir() - Part of the init_ironic() process