openstack/ironic
Code Issues Proposed changes

Update help string on tftp_root option

Browse Source 
Update the help string on the tftp_root option to indicate that the
ironic-conductor must have read/write access to the path.

Also did a 'tox -egenconfig' run to update ironic.conf.sample

Change-Id: Ibd724ff5d3f25aa1d13c0c29e18fcb466aa77c95
This commit is contained in:
John L. Villalovos
2015-09-10 11:21:48 -07:00
parent cbd47c4ac9
commit a457557dbe
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -987,8 +987,8 @@
# Maximum retries for iBoot operations (integer value) # Maximum retries for iBoot operations (integer value)
#max_retry=3 #max_retry=3
# Time between retry attempts for iBoot operations (integer # Time (in seconds) between retry attempts for iBoot
# value) # operations (integer value)
#retry_interval=1 #retry_interval=1
@@ -1726,7 +1726,8 @@
# value) # value)
#tftp_server=$my_ip #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 #tftp_root=/tftpboot
# On ironic-conductor node, directory where master TFTP images # On ironic-conductor node, directory where master TFTP images

6
ironic/drivers/modules/pxe.py
View File

@@ -54,10 +54,12 @@ pxe_opts = [
'configuration for UEFI boot loader.')), 'configuration for UEFI boot loader.')),
cfg.StrOpt('tftp_server', cfg.StrOpt('tftp_server',
default='$my_ip', 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', cfg.StrOpt('tftp_root',
default='/tftpboot', 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', cfg.StrOpt('tftp_master_path',
default='/tftpboot/master_images', default='/tftpboot/master_images',
help=_('On ironic-conductor node, directory where master TFTP ' help=_('On ironic-conductor node, directory where master TFTP '