Merge "ironic-conductor: configure ipxe_timeout to 60"

puppet/services/ironic-conductor.yaml

@@ -166,6 +166,10 @@ parameters:
     default: 8088
     description: Port to use for serving images when iPXE is used.
     type: string
+  IronicIPXETimeout:
+    default: 60
+    description: iPXE timeout in second. Set to 0 for infinite timeout.
+    type: string
   IronicPassword:
     description: The password for the Ironic service and db account, used by the Ironic services
     type: string
@@ -256,6 +260,7 @@ outputs:
                   - "%{hiera('ironic_conductor_http_host')}:"
                   - {get_param: IronicIPXEPort}
             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]}
             # NOTE: bind IP is found in hiera replacing the network name with the
             # local node IP for the given network; replacement examples

releasenotes/notes/ipxe_timeout-5824c87e849b1b50.yaml

@@ -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.