openstack/puppet-ironic
Code Issues Proposed changes

Drop logic for Ubuntu 20.04

Browse Source 
... because this module no longer supports that old version.

Change-Id: Iff4e364e1ef790f2df6463fbb60c0c11c4ac95c5
This commit is contained in:
Takashi Kajinami 2023-01-15 22:37:17 +09:00
parent 7aca18d7cb
commit 1990832379
3 changed files with 12 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/params.pp
View File

@ -86,14 +86,8 @@ class ironic::params {
$staging_drivers_package = 'ironic-staging-drivers'
$systemd_python_package = 'python-systemd'
$ipxe_rom_dir = '/usr/lib/ipxe'
if $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemmajrelease, '20.04') <= 0 {
# The ipxe package of Ubuntu 20.04 does not provide snponly.efi.
$ipxe_name_base = 'ipxe'
$uefi_ipxe_bootfile_name = 'ipxe.efi'
} else {
$ipxe_name_base = 'snponly'
$uefi_ipxe_bootfile_name = 'snponly.efi'
}
$ironic_wsgi_script_path = '/usr/lib/cgi-bin/ironic'
$ironic_wsgi_script_source = '/usr/bin/ironic-api-wsgi'
$xinetd_available = true

4
spec/classes/ironic_drivers_pxe_spec.rb
View File

@ -122,12 +122,8 @@ describe 'ironic::drivers::pxe' do
end
let :platform_params do
if facts[:operatingsystem] == 'Ubuntu' and facts[:operatingsystemmajrelease] <= '20.04'
{ :uefi_ipxe_bootfile_name => 'ipxe.efi' }
else
{ :uefi_ipxe_bootfile_name => 'snponly.efi' }
end
end
it_behaves_like 'ironic pxe driver'

12
spec/classes/ironic_pxe_spec.rb
View File

@ -368,17 +368,6 @@ describe 'ironic::pxe' do
let(:platform_params) do
case facts[:osfamily]
when 'Debian'
if facts[:operatingsystem] == 'Ubuntu' and facts[:operatingsystemmajrelease] <= '20.04'
{
:grub_efi_package => 'grub-efi-amd64-signed',
:ipxe_package => 'ipxe',
:shim_package => 'shim-signed',
:pxelinux_package => 'pxelinux',
:syslinux_package => 'syslinux-common',
:tftp_package => 'tftpd-hpa',
:uefi_ipxe_bootfile_name => 'ipxe.efi'
}
else
{
:grub_efi_package => 'grub-efi-amd64-signed',
:ipxe_package => 'ipxe',
@ -388,7 +377,6 @@ describe 'ironic::pxe' do
:tftp_package => 'tftpd-hpa',
:uefi_ipxe_bootfile_name => 'snponly.efi'
}
end
when 'RedHat'
{
:dnsmasq_tftp_package => 'openstack-ironic-dnsmasq-tftp-server',