openstack
/
puppet-ironic
Code Issues Proposed changes

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:
Bob Fournier 2018-11-05 21:00:33 -05:00
parent efac53e388
commit 0af07a5466
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/params.pp
View File

@ -63,8 +63,8 @@ class ironic::params {
$ironic_wsgi_script_source = "/usr/lib/python${$pyver3}/site-packages/ironic/api/app.wsgi"
$tftpd_package = 'tftp-server'
$ipxe_package = 'ipxe-bootimgs'
$syslinux_package = 'syslinux-extlinux'
$syslinux_path = '/usr/share/syslinux'
$syslinux_package = 'syslinux-tftpboot'
$syslinux_path = '/var/lib/tftpboot'
$syslinux_files = ['pxelinux.0', 'chain.c32']
}
'Debian': {

4
releasenotes/notes/use-syslinux-tftpboot-pkg-409e279e9b990456.yaml Normal file
View File

@ -0,0 +1,4 @@
---
fixes:
- In order to allow portability between x86_64 and ppc the
syslinux-tftpboot package is used for ironix-pxe.

6
spec/classes/ironic_pxe_spec.rb
View File

@ -132,11 +132,11 @@ describe 'ironic::pxe' do
:syslinux_path => false,
)
end
it 'should not contain package syslinux' do
is_expected.not_to contain_package('syslinux')
it 'should not contain package syslinux-tftpboot' do
is_expected.not_to contain_package('syslinux-tftpboot')
end
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