Skip to content

Commit 4239c18

Browse files
committed
Support GlusterFS 6
1 parent 61a380e commit 4239c18

File tree

2 files changed

+32
-10
lines changed

2 files changed

+32
-10
lines changed

manifests/repo/apt.pp

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,15 @@
3838
include 'apt'
3939

4040
$repo_key_name = $release ? {
41-
'3.10' => 'C784DD0FD61E38B8B1F65E10DAD761554A72C1DF',
42-
'3.11' => 'DE82F0BACC4DB70DBEF95CA65EC2255642304A6E',
43-
'3.12' => '8B7C364430B66F0B084C0B0C55339A4C6A7BD8D4',
44-
'3.13' => '9B5AE8E6FD2581F293104ACC38675E5F30F779AF',
45-
'4.0' => '55F839E173AC06F364120D46FA86EEACB306CEE1',
46-
'4.1' => 'EED3351AFD72E5437C050F0388F6CDEE78FA6D97',
47-
'^5\.(\d)+$' => 'F9C958A3AEE0D2184FAD1CBD43607F0DC2F8238C',
48-
default => '849512C2CA648EF425048F55C883F50CB2289A17',
41+
'3.10' => 'C784DD0FD61E38B8B1F65E10DAD761554A72C1DF',
42+
'3.11' => 'DE82F0BACC4DB70DBEF95CA65EC2255642304A6E',
43+
'3.12' => '8B7C364430B66F0B084C0B0C55339A4C6A7BD8D4',
44+
'3.13' => '9B5AE8E6FD2581F293104ACC38675E5F30F779AF',
45+
'4.0' => '55F839E173AC06F364120D46FA86EEACB306CEE1',
46+
'4.1' => 'EED3351AFD72E5437C050F0388F6CDEE78FA6D97',
47+
'5' => 'F9C958A3AEE0D2184FAD1CBD43607F0DC2F8238C',
48+
'6' => 'F9C958A3AEE0D2184FAD1CBD43607F0DC2F8238C',
49+
default => '849512C2CA648EF425048F55C883F50CB2289A17',
4950
}
5051

5152
$repo_key_source = "https://download.gluster.org/pub/gluster/glusterfs/${release}/rsa.pub"
@@ -72,9 +73,9 @@
7273
default => false,
7374
}
7475
if versioncmp($release, '3.12') < 0 {
75-
$repo_url = "https://download.gluster.org/pub/gluster/glusterfs/${release}/LATEST/Debian/${::lsbdistcodename}/apt/"
76+
$repo_url = "https://download.gluster.org/pub/gluster/glusterfs/${release}/${version}/Debian/${::lsbdistcodename}/apt/"
7677
} else {
77-
$repo_url = "https://download.gluster.org/pub/gluster/glusterfs/${release}/LATEST/Debian/${::lsbdistcodename}/${arch}/apt/"
78+
$repo_url = "https://download.gluster.org/pub/gluster/glusterfs/${release}/${version}/Debian/${::lsbdistcodename}/${arch}/apt/"
7879
}
7980
}
8081
}

spec/classes/repo_apt_spec.rb

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,27 @@
7373
end
7474
end
7575

76+
context 'Gluster release 6.3' do
77+
let :params do
78+
{
79+
release: '6',
80+
version: '6.3'
81+
}
82+
end
83+
84+
it 'installs' do
85+
is_expected.to contain_apt__source('glusterfs-6.3').with(
86+
repos: 'main',
87+
release: facts[:lsbdistcodename].to_s,
88+
key: {
89+
'id' => 'F9C958A3AEE0D2184FAD1CBD43607F0DC2F8238C',
90+
'key_source' => 'https://download.gluster.org/pub/gluster/glusterfs/6/rsa.pub'
91+
},
92+
location: "https://download.gluster.org/pub/gluster/glusterfs/6/6.3/Debian/#{facts[:lsbdistcodename]}/amd64/apt/"
93+
)
94+
end
95+
end
96+
7697
context 'Specific Gluster release 3.12' do
7798
let :params do
7899
{

0 commit comments

Comments
 (0)