openstack/ironic
Code Issues Proposed changes

Follow-up for bugfix 1694645 patch

Browse Source 
This change addresses review feedback from change
I55229f0ab37e657b7668dd4fe402fe6b5a6cda40 in the release
note, as well as the parameter text. Accordingly, the sample
configuration has been updated.

Change-Id: Ieea574f1bcc9b6c663aeb8d89475c1dd8cf6964d
This commit is contained in:
Julia Kreger 2017-07-03 15:05:46 +00:00
parent dd264ac909
commit 3e649a74b9
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etc/ironic/ironic.conf.sample
View File

@ -315,9 +315,9 @@
#grub_config_template = $pybasedir/common/grub_conf.template #grub_config_template = $pybasedir/common/grub_conf.template
# Path to ldlinux.c32 file. This file is required for syslinux # Path to ldlinux.c32 file. This file is required for syslinux
# 5.0 or later. If not specified, the file is searched in # 5.0 or later. If not specified, the file is looked for in
# general paths, "/usr/lib/syslinux/modules/bios/ldlinux.c32" # "/usr/lib/syslinux/modules/bios/ldlinux.c32" and
# and "/usr/share/syslinux/ldlinux.c32". (string value) # "/usr/share/syslinux/ldlinux.c32". (string value)
#ldlinux_c32 = <None> #ldlinux_c32 = <None>
# Run image downloads and raw format conversions in parallel. # Run image downloads and raw format conversions in parallel.

2
ironic/conf/default.py
View File

@ -202,7 +202,7 @@ image_opts = [
cfg.StrOpt('ldlinux_c32', cfg.StrOpt('ldlinux_c32',
help=_('Path to ldlinux.c32 file. This file is required for ' help=_('Path to ldlinux.c32 file. This file is required for '
'syslinux 5.0 or later. If not specified, the file is ' 'syslinux 5.0 or later. If not specified, the file is '
'searched in general paths, ' 'looked for in '
'"/usr/lib/syslinux/modules/bios/ldlinux.c32" and ' '"/usr/lib/syslinux/modules/bios/ldlinux.c32" and '
'"/usr/share/syslinux/ldlinux.c32".')), '"/usr/share/syslinux/ldlinux.c32".')),
] ]

14
releasenotes/notes/bug-1694645-57289200e35bd883.yaml
View File

@ -1,14 +1,12 @@
--- ---
fixes: fixes:
- | - |
Fix a bug that netboot is unavailable with virtual media boot in an Fixes a bug whereby netboot was unavailable with virtual media boot in an
environment using syslinux 5.00 or later such as Ubuntu 16.04. This is environment using syslinux 5.00 or later, such as Ubuntu 16.04. This was
caused by a change in syslinux that ldlinux.c32 is required for creating caused by a syslinux change; the ldlinux.c32 file is required for creating
boot ISO. This file is searched in the following general paths: a boot ISO. To address this, the new configuration option
``[DEFAULT]/ldlinux_32`` can be set to the path of the ldlinux.c32 file.
If not specified, the default is to look for the file in the paths:
* /usr/lib/syslinux/modules/bios/ldlinux.c32 * /usr/lib/syslinux/modules/bios/ldlinux.c32
* /usr/share/syslinux/ldlinux.c32 * /usr/share/syslinux/ldlinux.c32
This path can be set with the configuration parameter
``[DEFAULT]/ldlinux_c32`` for another distribution or for a case where the
path is changed with future update.