Merge "Revert "Configure ironic to do UEFI boot by default""

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

@@ -391,8 +391,6 @@ outputs:
               ironic::api::authtoken::interface: 'internal'
           - ironic::conductor::cleaning_disk_erase: {get_param: IronicCleaningDiskErase}
             ironic::conductor::default_boot_option: {get_param: IronicDefaultBootOption}
-            ironic::conductor::default_boot_mode: 'uefi'
-            ironic::drivers::ilo::default_boot_mode: 'uefi'
             ironic::conductor::automated_clean: {get_param: IronicAutomatedClean}
             ironic::conductor::enabled_hardware_types: {get_param: IronicEnabledHardwareTypes}
             ironic::conductor::force_power_state_during_sync: {get_param: IronicForcePowerStateDuringSync}
@@ -441,6 +439,8 @@ outputs:
               - 'always'
               - 'on_failure'
             ironic::drivers::agent::image_download_source: {get_param: IronicImageDownloadSource}
+            # NOTE(emilien): ILO defaulting to UEFI does not match other drivers so bios is used.
+            ironic::drivers::ilo::default_boot_mode: 'bios'
             ironic::drivers::interfaces::enabled_bios_interfaces: {get_param: IronicEnabledBiosInterfaces}
             ironic::drivers::interfaces::enabled_boot_interfaces: {get_param: IronicEnabledBootInterfaces}
             ironic::drivers::interfaces::enabled_console_interfaces: {get_param: IronicEnabledConsoleInterfaces}