openstack/tripleo-heat-templates
Code Issues Proposed changes

ironic-conductor: configure ipxe_timeout to 60

Browse Source 
... to have parity with instack-undercloud, we will set:
ironic::drivers::pxe::ipxe_timeout: 60

Note: this is done via a new parameter, IronicIPXETimeout that can be
overriden by the user.

Change-Id: I9c558340517fc6590123e20b12ce75a40a6084dd
This commit is contained in:
Emilien Macchi 2018-04-05 09:52:42 -07:00
parent 35e8b6d0ba
commit 931067f900
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
puppet/services/ironic-conductor.yaml
View File

@ -156,6 +156,10 @@ parameters:
default: 8088 default: 8088
description: Port to use for serving images when iPXE is used. description: Port to use for serving images when iPXE is used.
type: string type: string
IronicIPXETimeout:
default: 60
description: iPXE timeout in second. Set to 0 for infinite timeout.
type: string
IronicPassword: IronicPassword:
description: The password for the Ironic service and db account, used by the Ironic services description: The password for the Ironic service and db account, used by the Ironic services
type: string type: string
@ -236,6 +240,7 @@ outputs:
- "%{hiera('ironic_conductor_http_host')}:" - "%{hiera('ironic_conductor_http_host')}:"
- {get_param: IronicIPXEPort} - {get_param: IronicIPXEPort}
ironic::drivers::pxe::ipxe_enabled: {get_param: IronicIPXEEnabled} ironic::drivers::pxe::ipxe_enabled: {get_param: IronicIPXEEnabled}
ironic::drivers::pxe::ipxe_timeout: {get_param: IronicIPXETimeout}
ironic::glance_api_servers: {get_param: [EndpointMap, GlanceInternal, uri]} ironic::glance_api_servers: {get_param: [EndpointMap, GlanceInternal, uri]}
# NOTE: bind IP is found in hiera replacing the network name with the # NOTE: bind IP is found in hiera replacing the network name with the
# local node IP for the given network; replacement examples # local node IP for the given network; replacement examples

5
releasenotes/notes/ipxe_timeout-5824c87e849b1b50.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
A new parameter IronicIPXETimeout can change the default iPXE timeout, set to
60 seconds. Note that 0 would set an infinite timeout.