Remove deprecated options for ironic::drivers::pxe

deploy_kernel, deploy_ramdisk and pxe_deploy_timeout parameters
do nothing and will be removed soon

Change-Id: Ie4480f89b7f60dfe1282b47216633578f1a00539
This commit is contained in:
ZhongShengping 2017-03-16 22:06:04 +08:00
parent a78fd6cae9
commit afac29a623
2 changed files with 5 additions and 33 deletions

View File

@ -77,23 +77,6 @@
# Should be an valid integer # Should be an valid integer
# Defaults to $::os_service_default. # 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 ( class ironic::drivers::pxe (
$ipxe_enabled = false, $ipxe_enabled = false,
$pxe_append_params = $::os_service_default, $pxe_append_params = $::os_service_default,
@ -107,10 +90,6 @@ class ironic::drivers::pxe (
$uefi_pxe_bootfile_name = $::os_service_default, $uefi_pxe_bootfile_name = $::os_service_default,
$uefi_pxe_config_template = $::os_service_default, $uefi_pxe_config_template = $::os_service_default,
$ipxe_timeout = $::os_service_default, $ipxe_timeout = $::os_service_default,
# Deprecated
$deploy_kernel = undef,
$deploy_ramdisk = undef,
$pxe_deploy_timeout = undef,
) { ) {
include ::ironic::deps include ::ironic::deps
@ -142,16 +121,4 @@ class ironic::drivers::pxe (
'pxe/ipxe_timeout': value => $ipxe_timeout_real; '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')
}
} }

View File

@ -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.