Skip to content

Commit 68c3743

Browse files
SugatDikonia
andcommitted
(MODULES-11807) add EL10 basic support - align EL10 PGSQL 16 default package version
Co-authored-by: Matt Darcy <matt@projecthugo.co.uk>
1 parent 04a3fbe commit 68c3743

4 files changed

Lines changed: 15 additions & 6 deletions

File tree

manifests/dnfmodule.pp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], String[1]] $ensure = 'installed',
1010
String[1] $module = 'postgresql',
1111
) {
12+
if $facts['os']['release']['major'] == '10' {
13+
fail('DNF modules are not supported on EL 10')
14+
}
1215
package { 'postgresql dnf module':
1316
ensure => $ensure,
1417
name => $module,

manifests/globals.pp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@
199199
},
200200
'Amazon' => '9.2',
201201
default => $facts['os']['release']['major'] ? {
202+
'10' => '16',
202203
'9' => '13',
203204
'8' => '10',
204205
'7' => '9.2',

metadata.json

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,25 @@
3131
"operatingsystemrelease": [
3232
"7",
3333
"8",
34-
"9"
34+
"9",
35+
"10"
3536
]
3637
},
3738
{
3839
"operatingsystem": "CentOS",
3940
"operatingsystemrelease": [
4041
"7",
4142
"8",
42-
"9"
43+
"9",
44+
"10"
4345
]
4446
},
4547
{
4648
"operatingsystem": "OracleLinux",
4749
"operatingsystemrelease": [
4850
"7",
49-
"9"
51+
"9",
52+
"10"
5053
]
5154
},
5255
{
@@ -84,14 +87,16 @@
8487
"operatingsystem": "Rocky",
8588
"operatingsystemrelease": [
8689
"8",
87-
"9"
90+
"9",
91+
"10"
8892
]
8993
},
9094
{
9195
"operatingsystem": "AlmaLinux",
9296
"operatingsystemrelease": [
9397
"8",
94-
"9"
98+
"9",
99+
"10"
95100
]
96101
}
97102
],

spec/acceptance/server_instance_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# run a test task
44
require 'spec_helper_acceptance'
55

6-
describe 'postgresql instance test1', if: os[:family] == 'redhat' && !os[:release].start_with?('7') do
6+
describe 'postgresql instance test1', if: os[:family] == 'redhat' && os[:release].to_i.between?(8, 9) do
77
pp = <<-MANIFEST
88
# set global defaults
99
class { 'postgresql::globals':

0 commit comments

Comments
 (0)