Debian/Ubuntu: Use tftpd-hpa instead of tftpd
The tftpd-hpa package possesses a number of bugfixes and enhancements
over the original tftpd package. Especially it supports the 'tsize'
which is required by PXE.
Change-Id: I41b95f80ed4d972a65f25541d2c5f4ae2df79d60
(cherry picked from commit 80307bece6
)
This commit is contained in:
parent
1d21de3a88
commit
6cca1559f9
|
@ -89,7 +89,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' {
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
fixes:
|
||||
- |
|
||||
Now the ``tftpd-hap`` package is installed insted of the ``tftpd`` package
|
||||
in Debian and Ubuntu.
|
|
@ -155,6 +155,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
|
||||
|
||||
|
@ -254,6 +255,7 @@ describe 'ironic::pxe' do
|
|||
{
|
||||
:ipxe_package => 'ipxe',
|
||||
:syslinux_package => 'syslinux-common',
|
||||
:tftp_package => 'tftpd-hpa',
|
||||
}
|
||||
when 'RedHat'
|
||||
{
|
||||
|
@ -261,6 +263,7 @@ describe 'ironic::pxe' do
|
|||
:dnsmasq_tftp_service => 'openstack-ironic-dnsmasq-tftp-server',
|
||||
:ipxe_package => 'ipxe-bootimgs',
|
||||
:syslinux_package => 'syslinux-tftpboot',
|
||||
:tftp_package => 'tftp-server',
|
||||
}
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue