Merge "Add parameter IronicIPXEUefiSnpOnly"

deployment/ironic/ironic-conductor-container-puppet.yaml

@@ -298,6 +298,11 @@ parameters:
     type: string
     constraints:
       - allowed_values: ['oslo', 'json-rpc']
+  IronicIPXEUefiSnpOnly:
+    type: boolean
+    description: Wheater to use SNP (Simple Network Protocol) iPXE EFI, or not.
+                 When set to true `ipxe-snponly` EFI is used.
+    default: true
 
 parameter_groups:
 - label: deprecated
@@ -574,6 +579,12 @@ outputs:
                     - {get_param: IronicAuthStrategy}
                 ironic::drivers::inspector::endpoint_override: {get_param: [EndpointMap, IronicInspectorInternal, uri_no_suffix]}
                 ironic::service_catalog::endpoint_override: {get_param: [EndpointMap, IronicInternal, uri_no_suffix]}
+          - if:
+              - {get_param: IronicIPXEUefiSnpOnly}
+              - ironic::pxe::common::uefi_ipxe_bootfile_name: snponly.efi
+                ironic::pxe::ipxe_name_base: ipxe-snponly
+              - ironic::pxe::common::uefi_ipxe_bootfile_name: ipxe.efi
+                ironic::pxe::ipxe_name_base: ipxe
       service_config_settings: {}
       # BEGIN DOCKER SETTINGS
       puppet_config:

releasenotes/notes/uefi_ipxe_bootfile_name-f2c9cc8971dc1ed8.yaml

@@ -0,0 +1,9 @@
+---
+upgrade:
+  - |
+    The default UEFI iPXE bootfile is now `snponly.efi`. The boolean parameter
+    `IronicIPXEUefiSnpOnly` was added to allow custom configuration. When set
+    to `true` snponly is used, when `false` the previous default ipxe.efi is
+    used. See bug:
+    `1959726 <https://bugs.launchpad.net/tripleo/+bug/1959726>`_.
+