Skip to content

[apt] fix: actually use the version specified #184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

[apt] fix: actually use the version specified #184

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6912352
[apt] fix: actually use the version specified
gnif Oct 28, 2018
6a02a71
[params] Increment default version to 3.13
gnif Oct 28, 2018
0a886c8
[apt] add the repository fingerprint for 3.13
gnif Oct 28, 2018
93862fd
Merge branch 'master' into patch-2
gnif Dec 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# parameters dealing with installation
$install_server = true
$install_client = true
$release = '3.12'
$release = '3.13'
$version = 'LATEST'

# we explicitly do NOT set a priority here. The user must define
Expand Down
9 changes: 5 additions & 4 deletions manifests/repo/apt.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
'3.10' => 'C784DD0FD61E38B8B1F65E10DAD761554A72C1DF',
'3.11' => 'DE82F0BACC4DB70DBEF95CA65EC2255642304A6E',
'3.12' => '8B7C364430B66F0B084C0B0C55339A4C6A7BD8D4',
default => '849512C2CA648EF425048F55C883F50CB2289A17',
'3.13' => '9B5AE8E6FD2581F293104ACC38675E5F30F779AF',
default => '9B5AE8E6FD2581F293104ACC38675E5F30F779AF',
}

# Key location is different for some releases
Expand Down Expand Up @@ -77,10 +78,10 @@
/i\d86/ => 'i386',
default => false,
}
if versioncmp($release, '3.12') < 0 {
$repo_url = "http://download.gluster.org/pub/gluster/glusterfs/${release}/LATEST/Debian/${::lsbdistcodename}/apt/"
Copy link
Member

@dhoppe dhoppe Dec 3, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gnif Why did you changed the variable? It does only contain the version, but the spec tests are running against a specific release.

Copy link
Contributor Author

@gnif gnif Dec 4, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because the URL is incorrect. This doesn't break the specific release the spec tests are running against as it will still select the correct version.

if versioncmp($repo_ver, '3.12') < 0 {
$repo_url = "http://download.gluster.org/pub/gluster/glusterfs/${repo_ver}/Debian/${::lsbdistcodename}/apt/"
} else {
$repo_url = "http://download.gluster.org/pub/gluster/glusterfs/${release}/LATEST/Debian/${::lsbdistcodename}/${arch}/apt/"
$repo_url = "http://download.gluster.org/pub/gluster/glusterfs/${repo_ver}/Debian/${::lsbdistcodename}/${arch}/apt/"
}
}
}
Expand Down