Skip to content

Commit bbab735

Browse files
authored
Merge pull request #563 from bastelfreak/el10
Add EL10 support
2 parents d120d66 + d50aa3c commit bbab735

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

metadata.json

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,34 +45,39 @@
4545
"operatingsystem": "RedHat",
4646
"operatingsystemrelease": [
4747
"8",
48-
"9"
48+
"9",
49+
"10"
4950
]
5051
},
5152
{
5253
"operatingsystem": "CentOS",
5354
"operatingsystemrelease": [
54-
"9"
55+
"9",
56+
"10"
5557
]
5658
},
5759
{
5860
"operatingsystem": "AlmaLinux",
5961
"operatingsystemrelease": [
6062
"8",
61-
"9"
63+
"9",
64+
"10"
6265
]
6366
},
6467
{
6568
"operatingsystem": "Rocky",
6669
"operatingsystemrelease": [
6770
"8",
68-
"9"
71+
"9",
72+
"10"
6973
]
7074
},
7175
{
7276
"operatingsystem": "OracleLinux",
7377
"operatingsystemrelease": [
7478
"8",
75-
"9"
79+
"9",
80+
"10"
7681
]
7782
},
7883
{

spec/acceptance/networkd_spec.rb

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,14 @@
44

55
describe 'systemd with manage_networkd true' do
66
has_package = fact('os.family') == 'RedHat'
7-
8-
# On Enterprise Linux 8 & 9 the package is shipped in EPEL
9-
before { install_package(default, 'epel-release') if has_package && %w[8 9].include?(fact('os.release.major')) }
7+
package_name = if fact('os.name') == 'OracleLinux' && fact('os.release.major').to_i == 10
8+
'oracle-epel-release-el10'
9+
else
10+
'epel-release'
11+
end
12+
13+
# On Enterprise Linux 8 and newer the package is shipped in EPEL
14+
before { install_package(default, package_name) if has_package && %w[OracleLinux CentOS AlmaLinux Rocky].include?(fact('os.name')) }
1015

1116
context 'configure systemd-networkd' do
1217
let(:manifest) do

0 commit comments

Comments
 (0)