For ironic-pxe use syslinux-tftpboot package instead of syslinux
For portability, the syslinux-tftpboot package should be used instead of syslinux as it contains the same tftp server content and can be used on both x86_64 and ppc architectures. Change-Id: I9fd50e5312327da828d32e37a3ecf5e290485ca1 Closes-Bug: 1801824
This commit is contained in:
parent
efac53e388
commit
0af07a5466
|
@ -63,8 +63,8 @@ class ironic::params {
|
||||||
$ironic_wsgi_script_source = "/usr/lib/python${$pyver3}/site-packages/ironic/api/app.wsgi"
|
$ironic_wsgi_script_source = "/usr/lib/python${$pyver3}/site-packages/ironic/api/app.wsgi"
|
||||||
$tftpd_package = 'tftp-server'
|
$tftpd_package = 'tftp-server'
|
||||||
$ipxe_package = 'ipxe-bootimgs'
|
$ipxe_package = 'ipxe-bootimgs'
|
||||||
$syslinux_package = 'syslinux-extlinux'
|
$syslinux_package = 'syslinux-tftpboot'
|
||||||
$syslinux_path = '/usr/share/syslinux'
|
$syslinux_path = '/var/lib/tftpboot'
|
||||||
$syslinux_files = ['pxelinux.0', 'chain.c32']
|
$syslinux_files = ['pxelinux.0', 'chain.c32']
|
||||||
}
|
}
|
||||||
'Debian': {
|
'Debian': {
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
fixes:
|
||||||
|
- In order to allow portability between x86_64 and ppc the
|
||||||
|
syslinux-tftpboot package is used for ironix-pxe.
|
|
@ -132,11 +132,11 @@ describe 'ironic::pxe' do
|
||||||
:syslinux_path => false,
|
:syslinux_path => false,
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
it 'should not contain package syslinux' do
|
it 'should not contain package syslinux-tftpboot' do
|
||||||
is_expected.not_to contain_package('syslinux')
|
is_expected.not_to contain_package('syslinux-tftpboot')
|
||||||
end
|
end
|
||||||
it 'should not contain tftpboot syslinux file' do
|
it 'should not contain tftpboot syslinux file' do
|
||||||
is_expected.not_to contain_file('/tftpboot/pxelinux.0')
|
is_expected.not_to contain_file('/var/lib/ironic/tftpboot/pxelinux.0')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue