Merge "Remove unused config option - pxe_deploy_timeout"

etc/ironic/ironic.conf.sample

@@ -809,10 +809,6 @@
 # Template file for PXE configuration (string value)
 #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
 # value)
 #tftp_server=$my_ip

ironic/drivers/modules/pxe.py

@@ -56,9 +56,6 @@ pxe_opts = [
                default=paths.basedir_def(
                     'drivers/modules/pxe_config.template'),
                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',
                default='$my_ip',
                help='IP address of Ironic compute node\'s tftp server'),