openstack
/
ironic
Code Issues Proposed changes

Merge "Make pxelinux.cfg folder configurable"

This commit is contained in:
Zuul 2018-07-22 23:06:54 +00:00 committed by Gerrit Code Review
parent c0169613a4 cfa2ddf99c
commit e19efd8ca5
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ironic/common/pxe_utils.py
View File

@ -32,7 +32,7 @@ CONF = cfg.CONF
LOG = logging.getLogger(__name__)
PXE_CFG_DIR_NAME = 'pxelinux.cfg'
PXE_CFG_DIR_NAME = CONF.pxe.pxe_config_subdir
DHCP_CLIENT_ID = '61' # rfc2132
DHCP_TFTP_SERVER_NAME = '66' # rfc2132

7
ironic/conf/pxe.py
View File

@ -92,6 +92,13 @@ opts = [
cfg.StrOpt('pxe_bootfile_name',
default='pxelinux.0',
help=_('Bootfile DHCP parameter.')),
cfg.StrOpt('pxe_config_subdir',
default='pxelinux.cfg',
help=_('Directory in which to create symbolic links which '
'represent the MAC or IP address of the the ports on '
'a node and allow boot loaders to load the PXE '
'file for the node. This directory name is relative '
'to the PXE or iPXE folders.')),
cfg.StrOpt('uefi_pxe_bootfile_name',
default='bootx64.efi',
help=_('Bootfile DHCP parameter for UEFI boot mode.')),

10
releasenotes/notes/allow-pxelinux-config-folder-to-be-defined-da0ddd397d58dcc8.yaml Normal file
View File

@ -0,0 +1,10 @@
---
features:
- |
Adds a new configuration option ``[pxe]pxe_config_subdir`` to allow
operators to define the specific directory that may be used inside of
``/tftpboot`` or ``/httpboot`` for a boot loader to locate the
configuration file for the node. This option defaults to ``pxelinux.cfg``
which is the directory that the Syslinux `pxelinux.0` bootloader utilized.
Operators may wish to change the directory name if they are using other boot
loaders such as `GRUB` or `iPXE`.