Skip to content

Commit

Permalink
drop el7 support
Browse files Browse the repository at this point in the history
  • Loading branch information
jhoblitt committed Jul 31, 2024
1 parent 59f79f0 commit ccab47f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 15 deletions.
9 changes: 3 additions & 6 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,14 @@
})

# XXX The current dsid/rce service binaries are linked against
# libreadline.so.6, which does not exist in EL8+. error while loading shared
# libraries: libreadline.so.6: cannot open shared object file: No such file or
# directory
if fact('os.family') == 'RedHat' and versioncmp(fact('os.release.major'), '8') >= 0 {
# libreadline.so.7, which does not exist in EL9+.
if fact('os.family') == 'RedHat' and versioncmp(fact('os.release.major'), '9') >= 0 {
$readline = fact('os.release.major') ? {
'8' => 'libreadline.so.7.0',
'9' => 'libreadline.so.8.1',
default => 'libreadline.so.8.1',
}

file { '/usr/lib64/libreadline.so.6':
file { '/usr/lib64/libreadline.so.7':
ensure => link,
owner => 'root',
group => 'root',
Expand Down
6 changes: 0 additions & 6 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@
}
],
"operatingsystem_support": [
{
"operatingsystem": "CentOS",
"operatingsystemrelease": [
"7"
]
},
{
"operatingsystem": "AlmaLinux",
"operatingsystemrelease": [
Expand Down
6 changes: 3 additions & 3 deletions spec/acceptance/basic_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
it { is_expected.to be_mode '755' } # serverspec does not like a leading 0
end

if fact('os.release.major') == '8'
describe file('/usr/lib64/libreadline.so.6') do
if fact('os.release.major') == '9'
describe file('/usr/lib64/libreadline.so.7') do
it { is_expected.to be_symlink }
it { is_expected.to be_linked_to 'libreadline.so.7.0' }
it { is_expected.to be_linked_to 'libreadline.so.8.1' }
it { is_expected.to be_owned_by 'root' }
it { is_expected.to be_grouped_into 'root' }
end
Expand Down

0 comments on commit ccab47f

Please sign in to comment.