openstack
/
puppet-ironic
Code Issues Proposed changes

Cleanup codes for CentOS/RHEL7 

... since now this modules supports only CentOS8/RHEL8.

Change-Id: I3769b2b5c8e2e22e73742d392462fd23a6961af9
This commit is contained in:
Takashi Kajinami 2020-10-09 09:06:16 +09:00
parent 82a5587266
commit 742aaf5c31
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/params.pp
View File

@ -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'

3
manifests/pxe.pp
View File

@ -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 = ''

5
releasenotes/notes/drop-el7-support-1e4a347a8c45851b.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
Compatibility with el7 (RHEL7.x, CentOS7.x and so on) has been removed.