Skip to content

Commit 1e1d7ee

Browse files
committed
Fix release variable for Debian
1 parent 2745ce0 commit 1e1d7ee

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

manifests/repo/apt.pp

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@
3030
) {
3131
include 'apt'
3232

33+
$_release = versioncmp($release, '4.1') ? {
34+
1 => $release.match(/\A[^.]*/)[0],
35+
default => $release,
36+
}
37+
3338
# the Gluster repo only supports x86_64 (amd64) and arm64. The Ubuntu PPA also supports armhf and arm64.
3439
case $facts['os']['name'] {
3540
'Debian': {
@@ -44,7 +49,7 @@
4449
default => 'F9C958A3AEE0D2184FAD1CBD43607F0DC2F8238C',
4550
}
4651

47-
$repo_key_source = "https://download.gluster.org/pub/gluster/glusterfs/${release}/rsa.pub"
52+
$repo_key_source = "https://download.gluster.org/pub/gluster/glusterfs/${_release}/rsa.pub"
4853

4954
# basic sanity check
5055
if $version == 'LATEST' {
@@ -69,11 +74,6 @@
6974
$repo_url = if versioncmp($release, '4.1') < 0 {
7075
"${_repo_base}/01.old-releases/${release}/LATEST/Debian/${facts['os']['distro']['codename']}/${arch}/apt/"
7176
} else {
72-
$_release = if $release == '4.1' {
73-
$release
74-
} else {
75-
$release[0]
76-
}
7777
"${_repo_base}/${_release}/LATEST/Debian/${facts['os']['distro']['codename']}/${arch}/apt/"
7878
}
7979
}
@@ -91,11 +91,6 @@
9191
}
9292
$repo_ver = $version
9393

94-
$_release = versioncmp($release, '4.1') ? {
95-
1 => $release.match(/\A[^.]*/)[0],
96-
default => $release,
97-
}
98-
9994
$arch = $facts['os']['architecture'] ? {
10095
'amd64' => 'amd64',
10196
'arm64' => 'arm64',

0 commit comments

Comments
 (0)