diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample index 5f67e28737..30fd4c6f01 100644 --- a/etc/ironic/ironic.conf.sample +++ b/etc/ironic/ironic.conf.sample @@ -987,8 +987,8 @@ # Maximum retries for iBoot operations (integer value) #max_retry=3 -# Time between retry attempts for iBoot operations (integer -# value) +# Time (in seconds) between retry attempts for iBoot +# operations (integer value) #retry_interval=1 @@ -1726,7 +1726,8 @@ # value) #tftp_server=$my_ip -# ironic-conductor node's TFTP root path. (string value) +# ironic-conductor node's TFTP root path. The ironic-conductor +# must have read/write access to this path. (string value) #tftp_root=/tftpboot # On ironic-conductor node, directory where master TFTP images diff --git a/ironic/drivers/modules/pxe.py b/ironic/drivers/modules/pxe.py index 3fb271a9ca..5284d605f5 100644 --- a/ironic/drivers/modules/pxe.py +++ b/ironic/drivers/modules/pxe.py @@ -54,10 +54,12 @@ pxe_opts = [ 'configuration for UEFI boot loader.')), cfg.StrOpt('tftp_server', default='$my_ip', - help=_('IP address of ironic-conductor node\'s TFTP server.')), + help=_("IP address of ironic-conductor node's TFTP server.")), cfg.StrOpt('tftp_root', default='/tftpboot', - help=_('ironic-conductor node\'s TFTP root path.')), + help=_("ironic-conductor node's TFTP root path. The " + "ironic-conductor must have read/write access to this " + "path.")), cfg.StrOpt('tftp_master_path', default='/tftpboot/master_images', help=_('On ironic-conductor node, directory where master TFTP '