diff --git a/manifests/drivers/pxe.pp b/manifests/drivers/pxe.pp index dba94d08..65ff7a2d 100644 --- a/manifests/drivers/pxe.pp +++ b/manifests/drivers/pxe.pp @@ -77,23 +77,6 @@ # Should be an valid integer # Defaults to $::os_service_default. # -# DEPRECATED -# -# [*deploy_kernel*] -# (optional) Default kernel image ID used in deployment phase. -# Should be an valid id -# Defaults to undef. -# -# [*deploy_ramdisk*] -# (optional) Default kernel image ID used in deployment phase. -# Should be an valid id -# Defaults to undef. -# -# [*pxe_deploy_timeout*] -# (optional) Timeout for PXE deployments. -# Should be an valid integer -# Defaults to undef - class ironic::drivers::pxe ( $ipxe_enabled = false, $pxe_append_params = $::os_service_default, @@ -107,10 +90,6 @@ class ironic::drivers::pxe ( $uefi_pxe_bootfile_name = $::os_service_default, $uefi_pxe_config_template = $::os_service_default, $ipxe_timeout = $::os_service_default, - # Deprecated - $deploy_kernel = undef, - $deploy_ramdisk = undef, - $pxe_deploy_timeout = undef, ) { include ::ironic::deps @@ -142,16 +121,4 @@ class ironic::drivers::pxe ( 'pxe/ipxe_timeout': value => $ipxe_timeout_real; } - if $deploy_kernel { - warning('deploy_kernel option does nothing and will be removed soon') - } - - if $deploy_ramdisk { - warning('deploy_ramdisk option does nothing and will be removed soon') - } - - if $pxe_deploy_timeout { - warning('deploy_ramdisk option does nothing and will be removed soon') - } - } diff --git a/releasenotes/notes/remove_deprecated_driver_pxe_options-5619a2354d87632f.yaml b/releasenotes/notes/remove_deprecated_driver_pxe_options-5619a2354d87632f.yaml new file mode 100644 index 00000000..f64d8077 --- /dev/null +++ b/releasenotes/notes/remove_deprecated_driver_pxe_options-5619a2354d87632f.yaml @@ -0,0 +1,5 @@ +--- +other: + - Removed deprecated option ironic::drivers::pxe::deploy_kernel. + - Removed deprecated option ironic::drivers::pxe::deploy_ramdisk. + - Removed deprecated option ironic::drivers::pxe::pxe_deploy_timeout.