Merge "Debian/Ubuntu: Use tftpd-hpa instead of tftpd"

This commit is contained in:
Zuul 2022-07-06 16:41:43 +00:00 committed by Gerrit Code Review
commit 19b9ee4083
3 changed files with 9 additions and 1 deletions

View File

@ -93,7 +93,7 @@ class ironic::params {
$ironic_wsgi_script_path = '/usr/lib/cgi-bin/ironic'
$ironic_wsgi_script_source = '/usr/bin/ironic-api-wsgi'
$xinetd_available = true
$tftpd_package = 'tftpd'
$tftpd_package = 'tftpd-hpa'
$ipxe_package = 'ipxe'
$syslinux_package = 'syslinux-common'
if $::operatingsystem == 'Debian' {

View File

@ -0,0 +1,5 @@
---
fixes:
- |
Now the ``tftpd-hap`` package is installed insted of the ``tftpd`` package
in Debian and Ubuntu.

View File

@ -215,6 +215,7 @@ describe 'ironic::pxe' do
it 'should install tftp-server package' do
is_expected.to contain_package('tftp-server').with(
'ensure' => 'present',
'name' => platform_params[:tftp_package]
)
end
@ -316,6 +317,7 @@ describe 'ironic::pxe' do
:ipxe_package => 'ipxe',
:shim_package => 'shim-signed',
:syslinux_package => 'syslinux-common',
:tftp_package => 'tftpd-hpa',
}
when 'RedHat'
{
@ -325,6 +327,7 @@ describe 'ironic::pxe' do
:ipxe_package => 'ipxe-bootimgs',
:shim_package => 'shim',
:syslinux_package => 'syslinux-tftpboot',
:tftp_package => 'tftp-server',
}
end
end