From 1929c31aacf2aa5adc05a36e75fcdd1951942c4d Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 21 Nov 2022 14:08:28 +0900 Subject: [PATCH] Remove logic for CentOS < 9 ... because RDO supports CentOS Stream 9 (aka CentOS 9) only since Zed. Change-Id: I7514c4384a15b235a54f1c310f6d0167089e0515 --- manifests/params.pp | 9 ++------- spec/classes/ironic_pxe_spec.rb | 5 +---- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 58366934..03aa12e4 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -57,13 +57,8 @@ class ironic::params { $uefi_ipxe_bootfile_name = 'snponly.efi' $ironic_wsgi_script_path = '/var/www/cgi-bin/ironic' $ironic_wsgi_script_source = '/usr/bin/ironic-api-wsgi' - if (Integer.new($::os['release']['major']) > 8) { - $xinetd_available = false - $tftpd_package = false - } else { - $xinetd_available = true - $tftpd_package = 'tftp-server' - } + $xinetd_available = false + $tftpd_package = false $ipxe_package = 'ipxe-bootimgs' $pxelinux_package = false $pxelinux_path = false diff --git a/spec/classes/ironic_pxe_spec.rb b/spec/classes/ironic_pxe_spec.rb index 665893a0..2e618c40 100644 --- a/spec/classes/ironic_pxe_spec.rb +++ b/spec/classes/ironic_pxe_spec.rb @@ -409,11 +409,8 @@ describe 'ironic::pxe' do it_behaves_like 'ironic pxe without xinetd' end - unless facts[:osfamily] == 'RedHat' and facts[:operatingsystemmajrelease].to_i >= 9 - it_behaves_like 'ironic pxe with xinetd' - end - if facts[:osfamily] == 'Debian' + it_behaves_like 'ironic pxe with xinetd' it_behaves_like 'ironic pxe with pxelinux package' end end