Drop logic for Ubuntu 20.04
... because this module no longer supports that old version. Change-Id: Iff4e364e1ef790f2df6463fbb60c0c11c4ac95c5
This commit is contained in:
parent
7aca18d7cb
commit
1990832379
@ -86,14 +86,8 @@ class ironic::params {
|
|||||||
$staging_drivers_package = 'ironic-staging-drivers'
|
$staging_drivers_package = 'ironic-staging-drivers'
|
||||||
$systemd_python_package = 'python-systemd'
|
$systemd_python_package = 'python-systemd'
|
||||||
$ipxe_rom_dir = '/usr/lib/ipxe'
|
$ipxe_rom_dir = '/usr/lib/ipxe'
|
||||||
if $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemmajrelease, '20.04') <= 0 {
|
$ipxe_name_base = 'snponly'
|
||||||
# The ipxe package of Ubuntu 20.04 does not provide snponly.efi.
|
$uefi_ipxe_bootfile_name = '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_path = '/usr/lib/cgi-bin/ironic'
|
||||||
$ironic_wsgi_script_source = '/usr/bin/ironic-api-wsgi'
|
$ironic_wsgi_script_source = '/usr/bin/ironic-api-wsgi'
|
||||||
$xinetd_available = true
|
$xinetd_available = true
|
||||||
|
@ -122,11 +122,7 @@ describe 'ironic::drivers::pxe' do
|
|||||||
end
|
end
|
||||||
|
|
||||||
let :platform_params do
|
let :platform_params do
|
||||||
if facts[:operatingsystem] == 'Ubuntu' and facts[:operatingsystemmajrelease] <= '20.04'
|
{ :uefi_ipxe_bootfile_name => 'snponly.efi' }
|
||||||
{ :uefi_ipxe_bootfile_name => 'ipxe.efi' }
|
|
||||||
else
|
|
||||||
{ :uefi_ipxe_bootfile_name => 'snponly.efi' }
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it_behaves_like 'ironic pxe driver'
|
it_behaves_like 'ironic pxe driver'
|
||||||
|
@ -368,27 +368,15 @@ describe 'ironic::pxe' do
|
|||||||
let(:platform_params) do
|
let(:platform_params) do
|
||||||
case facts[:osfamily]
|
case facts[:osfamily]
|
||||||
when 'Debian'
|
when 'Debian'
|
||||||
if facts[:operatingsystem] == 'Ubuntu' and facts[:operatingsystemmajrelease] <= '20.04'
|
{
|
||||||
{
|
:grub_efi_package => 'grub-efi-amd64-signed',
|
||||||
:grub_efi_package => 'grub-efi-amd64-signed',
|
:ipxe_package => 'ipxe',
|
||||||
:ipxe_package => 'ipxe',
|
:shim_package => 'shim-signed',
|
||||||
:shim_package => 'shim-signed',
|
:pxelinux_package => 'pxelinux',
|
||||||
:pxelinux_package => 'pxelinux',
|
:syslinux_package => 'syslinux-common',
|
||||||
:syslinux_package => 'syslinux-common',
|
:tftp_package => 'tftpd-hpa',
|
||||||
:tftp_package => 'tftpd-hpa',
|
:uefi_ipxe_bootfile_name => 'snponly.efi'
|
||||||
:uefi_ipxe_bootfile_name => 'ipxe.efi'
|
}
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
: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 => 'snponly.efi'
|
|
||||||
}
|
|
||||||
end
|
|
||||||
when 'RedHat'
|
when 'RedHat'
|
||||||
{
|
{
|
||||||
:dnsmasq_tftp_package => 'openstack-ironic-dnsmasq-tftp-server',
|
:dnsmasq_tftp_package => 'openstack-ironic-dnsmasq-tftp-server',
|
||||||
|
Loading…
Reference in New Issue
Block a user