Skip to content

Commit dc59d2e

Browse files
committed
Rely on puppetlabs-apt to handle https transport
1 parent 72a80cd commit dc59d2e

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

manifests/repo/apt.pp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
) {
3838
include '::apt'
3939

40-
ensure_packages(['apt-transport-https'], {'ensure' => 'present'})
41-
4240
# Key has changed since 3.9
4341
$repo_key_name = $release ? {
4442
'3.8' => 'A4703C37D3F4DE7F1819E980FE79BB52D5DC52DC',
@@ -78,9 +76,9 @@
7876
default => false,
7977
}
8078
if versioncmp($release, '3.12') < 0 {
81-
$repo_url = "http://download.gluster.org/pub/gluster/glusterfs/${release}/LATEST/Debian/${::lsbdistcodename}/apt/"
79+
$repo_url = "https://download.gluster.org/pub/gluster/glusterfs/${release}/LATEST/Debian/${::lsbdistcodename}/apt/"
8280
} else {
83-
$repo_url = "http://download.gluster.org/pub/gluster/glusterfs/${release}/LATEST/Debian/${::lsbdistcodename}/${arch}/apt/"
81+
$repo_url = "https://download.gluster.org/pub/gluster/glusterfs/${release}/LATEST/Debian/${::lsbdistcodename}/${arch}/apt/"
8482
}
8583
}
8684
}

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"dependencies": [
4141
{
4242
"name": "puppetlabs/apt",
43-
"version_requirement": ">= 2.1.0 < 7.0.0"
43+
"version_requirement": ">= 4.4.0 < 7.0.0"
4444
},
4545
{
4646
"name": "puppetlabs/stdlib",

spec/classes/init_spec.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
context 'Debian specific stuff' do
7070
it { is_expected.to contain_class('gluster::repo::apt') }
7171
it { is_expected.to contain_apt__source('glusterfs-LATEST') }
72-
it { is_expected.to contain_package('apt-transport-https') }
7372
it 'creates gluster::install' do
7473
is_expected.to create_class('gluster::install').with(
7574
server: true,

spec/classes/repo_apt_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
is_expected.to contain_apt__source('glusterfs-LATEST').with(
2020
repos: 'main',
2121
release: facts[:lsbdistcodename].to_s,
22-
location: "http://download.gluster.org/pub/gluster/glusterfs/3.12/LATEST/Debian/#{facts[:lsbdistcodename]}/#{facts[:architecture]}/apt/"
22+
location: "https://download.gluster.org/pub/gluster/glusterfs/3.12/LATEST/Debian/#{facts[:lsbdistcodename]}/#{facts[:architecture]}/apt/"
2323
)
2424
end
2525
end
@@ -47,7 +47,7 @@
4747
is_expected.to contain_apt__source('glusterfs-LATEST').with(
4848
repos: 'main',
4949
release: facts[:lsbdistcodename].to_s,
50-
location: "http://download.gluster.org/pub/gluster/glusterfs/3.12/LATEST/Debian/#{facts[:lsbdistcodename]}/#{facts[:architecture]}/apt/",
50+
location: "https://download.gluster.org/pub/gluster/glusterfs/3.12/LATEST/Debian/#{facts[:lsbdistcodename]}/#{facts[:architecture]}/apt/",
5151
pin: '700'
5252
)
5353
end
@@ -68,7 +68,7 @@
6868
'id' => '849512C2CA648EF425048F55C883F50CB2289A17',
6969
'key_source' => 'https://download.gluster.org/pub/gluster/glusterfs/3.9/rsa.pub'
7070
},
71-
location: "http://download.gluster.org/pub/gluster/glusterfs/3.9/LATEST/Debian/#{facts[:lsbdistcodename]}/apt/"
71+
location: "https://download.gluster.org/pub/gluster/glusterfs/3.9/LATEST/Debian/#{facts[:lsbdistcodename]}/apt/"
7272
)
7373
end
7474
end

0 commit comments

Comments
 (0)