Require valid values for (i)PXE parameters
Related-Bug: #2058229 Change-Id: I228074623f1400985bb7f5a4c187ac14cf28c435
This commit is contained in:
Takashi Kajinami
parent
3817181245
commit
224679340d
@ -134,30 +134,30 @@
|
||||
# Defaults to false (no ppc64le support)
|
||||
#
|
||||
class ironic::drivers::pxe (
|
||||
$kernel_append_params = $facts['os_service_default'],
|
||||
$pxe_bootfile_name = $facts['os_service_default'],
|
||||
$pxe_config_template = $facts['os_service_default'],
|
||||
$ipxe_bootfile_name = $facts['os_service_default'],
|
||||
$ipxe_config_template = $facts['os_service_default'],
|
||||
$tftp_server = $facts['os_service_default'],
|
||||
$tftp_root = '/tftpboot',
|
||||
$images_path = $facts['os_service_default'],
|
||||
$tftp_master_path = $facts['os_service_default'],
|
||||
$instance_master_path = $facts['os_service_default'],
|
||||
$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'],
|
||||
$boot_retry_timeout = $facts['os_service_default'],
|
||||
$boot_retry_check_interval = $facts['os_service_default'],
|
||||
$dir_permission = $facts['os_service_default'],
|
||||
$file_permission = $facts['os_service_default'],
|
||||
$loader_file_paths = $facts['os_service_default'],
|
||||
$pxe_bootfile_name_by_arch = $facts['os_service_default'],
|
||||
$ipxe_bootfile_name_by_arch = $facts['os_service_default'],
|
||||
$pxe_config_template_by_arch = $facts['os_service_default'],
|
||||
$kernel_append_params = $facts['os_service_default'],
|
||||
$pxe_bootfile_name = $facts['os_service_default'],
|
||||
$pxe_config_template = $facts['os_service_default'],
|
||||
$ipxe_bootfile_name = $facts['os_service_default'],
|
||||
$ipxe_config_template = $facts['os_service_default'],
|
||||
$tftp_server = $facts['os_service_default'],
|
||||
$tftp_root = '/tftpboot',
|
||||
$images_path = $facts['os_service_default'],
|
||||
$tftp_master_path = $facts['os_service_default'],
|
||||
$instance_master_path = $facts['os_service_default'],
|
||||
String[1] $uefi_pxe_bootfile_name = $::ironic::params::uefi_pxe_bootfile_name,
|
||||
$uefi_pxe_config_template = $facts['os_service_default'],
|
||||
String[1] $uefi_ipxe_bootfile_name = $::ironic::params::uefi_ipxe_bootfile_name,
|
||||
$ipxe_timeout = $facts['os_service_default'],
|
||||
$boot_retry_timeout = $facts['os_service_default'],
|
||||
$boot_retry_check_interval = $facts['os_service_default'],
|
||||
$dir_permission = $facts['os_service_default'],
|
||||
$file_permission = $facts['os_service_default'],
|
||||
$loader_file_paths = $facts['os_service_default'],
|
||||
$pxe_bootfile_name_by_arch = $facts['os_service_default'],
|
||||
$ipxe_bootfile_name_by_arch = $facts['os_service_default'],
|
||||
$pxe_config_template_by_arch = $facts['os_service_default'],
|
||||
# DEPRECATED PARAMETERS
|
||||
Boolean $enable_ppc64le = false,
|
||||
Boolean $enable_ppc64le = false,
|
||||
) inherits ironic::params {
|
||||
|
||||
include ironic::deps
|
||||
|
||||
@ -341,7 +341,7 @@ class ironic::inspector (
|
||||
String[1] $kernel_filename = 'agent.kernel',
|
||||
$additional_processing_hooks = undef,
|
||||
String $ramdisk_kernel_args = '',
|
||||
$ipxe_timeout = 0,
|
||||
Integer[0] $ipxe_timeout = 0,
|
||||
$http_port = '8088',
|
||||
$detect_boot_mode = $facts['os_service_default'],
|
||||
$tftp_root = '/tftpboot',
|
||||
|
||||
@ -104,25 +104,25 @@
|
||||
# Defaults to {}
|
||||
#
|
||||
class ironic::pxe (
|
||||
$package_ensure = 'present',
|
||||
Boolean $manage_service = true,
|
||||
Boolean $enabled = true,
|
||||
$tftp_root = '/tftpboot',
|
||||
$http_root = '/httpboot',
|
||||
$http_port = 8088,
|
||||
$pxelinux_path = $::ironic::params::pxelinux_path,
|
||||
$syslinux_path = $::ironic::params::syslinux_path,
|
||||
$syslinux_files = $::ironic::params::syslinux_files,
|
||||
$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 = $::ironic::params::uefi_pxe_bootfile_name,
|
||||
Boolean $tftp_use_xinetd = $::ironic::params::xinetd_available,
|
||||
$dnsmasq_log_facility = undef,
|
||||
Boolean $manage_http_server = true,
|
||||
$vhost_priority = 10,
|
||||
Array[String] $vhost_options = ['-Indexes', '+FollowSymLinks'],
|
||||
Hash $vhost_config = {},
|
||||
$package_ensure = 'present',
|
||||
Boolean $manage_service = true,
|
||||
Boolean $enabled = true,
|
||||
$tftp_root = '/tftpboot',
|
||||
$http_root = '/httpboot',
|
||||
$http_port = 8088,
|
||||
$pxelinux_path = $::ironic::params::pxelinux_path,
|
||||
$syslinux_path = $::ironic::params::syslinux_path,
|
||||
$syslinux_files = $::ironic::params::syslinux_files,
|
||||
$tftp_bind_host = undef,
|
||||
String[1] $ipxe_name_base = $::ironic::params::ipxe_name_base,
|
||||
String[1] $uefi_ipxe_bootfile_name = $::ironic::params::uefi_ipxe_bootfile_name,
|
||||
String[1] $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,
|
||||
$vhost_priority = 10,
|
||||
Array[String] $vhost_options = ['-Indexes', '+FollowSymLinks'],
|
||||
Hash $vhost_config = {},
|
||||
) inherits ironic::params {
|
||||
|
||||
include ironic::deps
|
||||
|
||||
@ -46,12 +46,12 @@
|
||||
# Defaults to undef.
|
||||
#
|
||||
class ironic::pxe::common (
|
||||
$tftp_root = undef,
|
||||
$http_root = undef,
|
||||
$http_port = undef,
|
||||
$ipxe_timeout = undef,
|
||||
$uefi_ipxe_bootfile_name = undef,
|
||||
$uefi_pxe_bootfile_name = undef,
|
||||
$tftp_root = undef,
|
||||
$http_root = undef,
|
||||
$http_port = undef,
|
||||
Optional[Integer[0]] $ipxe_timeout = undef,
|
||||
Optional[String[1]] $uefi_ipxe_bootfile_name = undef,
|
||||
Optional[String[1]] $uefi_pxe_bootfile_name = undef,
|
||||
) {
|
||||
include ironic::deps
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user