openstack/ironic
Code Issues Proposed changes

Merge "Add a note for specifying octal value of permission"

Browse Source
This commit is contained in:
Jenkins
2017-06-06 13:20:50 +00:00
committed by Gerrit Code Review
parent 897e1b6851 d115373ff5
commit 55aab069a1
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3336,7 +3336,8 @@
# conductor is creating files that cannot be read by the TFTP # conductor is creating files that cannot be read by the TFTP
# server. Setting to <None> will result in the operating # server. Setting to <None> will result in the operating
# system's umask to be utilized for the creation of new tftp # system's umask to be utilized for the creation of new tftp
# folders. (integer value) # folders. It is recommended that an octal representation is
# specified. For example: 0o755 (integer value)
#dir_permission = <None> #dir_permission = <None>
# Bootfile DHCP parameter. (string value) # Bootfile DHCP parameter. (string value)

3
ironic/conf/pxe.py
View File

@@ -87,7 +87,8 @@ opts = [
"creating files that cannot be read by the TFTP server. " "creating files that cannot be read by the TFTP server. "
"Setting to <None> will result in the operating " "Setting to <None> will result in the operating "
"system's umask to be utilized for the creation of new " "system's umask to be utilized for the creation of new "
"tftp folders.")), "tftp folders. It is recommended that an octal "
"representation is specified. For example: 0o755")),
cfg.StrOpt('pxe_bootfile_name', cfg.StrOpt('pxe_bootfile_name',
default='pxelinux.0', default='pxelinux.0',
help=_('Bootfile DHCP parameter.')), help=_('Bootfile DHCP parameter.')),