openstack/ironic
Code Issues Proposed changes

Merge "Remove unused config option - pxe_deploy_timeout"

Browse Source
This commit is contained in:
Jenkins 2014-01-27 02:26:03 +00:00 committed by Gerrit Code Review
commit 5983ad8523
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -809,10 +809,6 @@
# Template file for PXE configuration (string value) # Template file for PXE configuration (string value)
#pxe_config_template=$pybasedir/drivers/modules/pxe_config.template #pxe_config_template=$pybasedir/drivers/modules/pxe_config.template
# Timeout for PXE deployments. Default: 0 (unlimited) (integer
# value)
#pxe_deploy_timeout=0
# IP address of Ironic compute node's tftp server (string # IP address of Ironic compute node's tftp server (string
# value) # value)
#tftp_server=$my_ip #tftp_server=$my_ip

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

@ -56,9 +56,6 @@ pxe_opts = [
default=paths.basedir_def( default=paths.basedir_def(
'drivers/modules/pxe_config.template'), 'drivers/modules/pxe_config.template'),
help='Template file for PXE configuration'), help='Template file for PXE configuration'),
cfg.IntOpt('pxe_deploy_timeout',
help='Timeout for PXE deployments. Default: 0 (unlimited)',
default=0),
cfg.StrOpt('tftp_server', cfg.StrOpt('tftp_server',
default='$my_ip', default='$my_ip',
help='IP address of Ironic compute node\'s tftp server'), help='IP address of Ironic compute node\'s tftp server'),