commit 742aaf5c3157720fd338060c6e1a471883ba238a Author: Takashi Kajinami Date: Fri Oct 9 09:06:16 2020 +0900 Cleanup codes for CentOS/RHEL7 ... since now this modules supports only CentOS8/RHEL8. Change-Id: I3769b2b5c8e2e22e73742d392462fd23a6961af9 diff --git a/manifests/params.pp b/manifests/params.pp index eb2b3d2..3c9a821 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -27,8 +27,7 @@ class ironic::params { if ($::os_package_type == 'debian') { $syslinux_path_custom = '/usr/lib/syslinux' - } elsif ($::os['name'] == 'Fedora') or - ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) { + } elsif ($::os['family'] == 'RedHat'){ $syslinux_path_custom = '/tftpboot' } else { $syslinux_path_custom = '/var/lib/tftpboot' @@ -66,11 +65,7 @@ class ironic::params { $ipxe_package = 'ipxe-bootimgs' $syslinux_package = 'syslinux-tftpboot' $syslinux_path = $syslinux_path_custom - if (Integer.new($::os['release']['major']) > 7) { - $syslinux_files = ['pxelinux.0', 'chain.c32', 'ldlinux.c32'] - } else { - $syslinux_files = ['pxelinux.0', 'chain.c32'] - } + $syslinux_files = ['pxelinux.0', 'chain.c32', 'ldlinux.c32'] } 'Debian': { $common_package_name = 'ironic-common' diff --git a/manifests/pxe.pp b/manifests/pxe.pp index b83347b..3fea90d 100644 --- a/manifests/pxe.pp +++ b/manifests/pxe.pp @@ -76,8 +76,7 @@ class ironic::pxe ( $http_root_real = pick($::ironic::pxe::common::http_root, $http_root) $http_port_real = pick($::ironic::pxe::common::http_port, $http_port) - if ($::os['name'] == 'Fedora') or - ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) { + if $::os['family'] == 'RedHat' { $arch = "-${::os['architecture']}" } else { $arch = '' diff --git a/releasenotes/notes/drop-el7-support-1e4a347a8c45851b.yaml b/releasenotes/notes/drop-el7-support-1e4a347a8c45851b.yaml new file mode 100644 index 0000000..f0ecd1d --- /dev/null +++ b/releasenotes/notes/drop-el7-support-1e4a347a8c45851b.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Compatibility with el7 (RHEL7.x, CentOS7.x and so on) has been removed. +