openstack/puppet-ironic
Code Issues Proposed changes

Define default uefi_pxe_bootfile_name in a common place

Browse Source 
... instead of defining the same value in multiple locations.

Change-Id: I64a1fcf368c6170c2d5d58a50476775d1e700c06
This commit is contained in:
Takashi Kajinami 2023-08-23 11:55:11 +09:00
parent e89fa71c04
commit edda6d8bcb
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/drivers/pxe.pp
View File

@ -139,7 +139,7 @@ class ironic::drivers::pxe (
$images_path = $facts['os_service_default'],
$tftp_master_path = $facts['os_service_default'],
$instance_master_path = $facts['os_service_default'],
$uefi_pxe_bootfile_name = 'bootx64.efi',
$uefi_pxe_bootfile_name = $::ironic::params::uefi_pxe_bootfile_name,
$uefi_pxe_config_template = $facts['os_service_default'],
$uefi_ipxe_bootfile_name = $::ironic::params::uefi_ipxe_bootfile_name,
$ipxe_timeout = $facts['os_service_default'],

2
manifests/params.pp
View File

@ -54,6 +54,7 @@ class ironic::params {
$systemd_python_package = 'systemd-python'
$ipxe_rom_dir = '/usr/share/ipxe'
$ipxe_name_base = 'ipxe-snponly'
$uefi_pxe_bootfile_name = 'bootx64.efi'
$uefi_ipxe_bootfile_name = 'snponly.efi'
$ironic_wsgi_script_path = '/var/www/cgi-bin/ironic'
$ironic_wsgi_script_source = '/usr/bin/ironic-api-wsgi'
@ -95,6 +96,7 @@ class ironic::params {
$systemd_python_package = 'python3-systemd'
$ipxe_rom_dir = '/usr/lib/ipxe'
$ipxe_name_base = 'snponly'
$uefi_pxe_bootfile_name = 'bootx64.efi'
$uefi_ipxe_bootfile_name = 'snponly.efi'
$ironic_wsgi_script_path = '/usr/lib/cgi-bin/ironic'
$ironic_wsgi_script_source = '/usr/bin/ironic-api-wsgi'

4
manifests/pxe.pp
View File

@ -76,7 +76,7 @@
# (optional) Name of efi file used to boot servers with PXE + UEFI. This
# should be consistent with the uefi_pxe_bootfile_name parameter in pxe
# driver.
# Defaults to 'bootx64.efi'
# Defaults to $::ironic::params::uefi_pxe_bootfile_name
#
# [*tftp_use_xinetd*]
# (optional) Override wheter to use xinetd instead of dnsmasq as the tftp
@ -104,7 +104,7 @@ class ironic::pxe (
$tftp_bind_host = undef,
$ipxe_name_base = $::ironic::params::ipxe_name_base,
$uefi_ipxe_bootfile_name = $::ironic::params::uefi_ipxe_bootfile_name,
$uefi_pxe_bootfile_name = 'bootx64.efi',
$uefi_pxe_bootfile_name = $::ironic::params::uefi_pxe_bootfile_name,
Boolean $tftp_use_xinetd = $::ironic::params::xinetd_available,
$dnsmasq_log_facility = undef,
Boolean $manage_http_server = true,