Skip to content

Commit e2d3b2e

Browse files
committed
backports: don't hardcode an old gpg key for Ubuntu
Same as #847 but for Ubuntu. The gpg keys used to sign the Ubuntu repos, including backports, come with standard Ubuntu installations, so this Puppet module doesn't need to add any key. Having this old key causes Puppet run failures for 20.04 and newer machines without Internet access.
1 parent efc530e commit e2d3b2e

File tree

3 files changed

+0
-5
lines changed

3 files changed

+0
-5
lines changed

manifests/backports.pp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,6 @@
8383
unless $repos {
8484
$_repos = $apt::backports['repos']
8585
}
86-
unless $key {
87-
$_key = $apt::backports['key']
88-
}
8986

9087
if $pin =~ Hash {
9188
$_pin = $pin

manifests/params.pp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@
8888
'Ubuntu': {
8989
$backports = {
9090
'location' => 'http://archive.ubuntu.com/ubuntu',
91-
'key' => '630239CC130E1A7FD81A27B140976EAF437D05B5',
9291
'repos' => 'main universe multiverse restricted',
9392
}
9493
$ppa_options = ['-y']

spec/classes/apt_backports_spec.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252

5353
it {
5454
expect(subject).to contain_apt__source('backports').with(location: 'http://archive.ubuntu.com/ubuntu',
55-
key: '630239CC130E1A7FD81A27B140976EAF437D05B5',
5655
repos: 'main universe multiverse restricted',
5756
release: 'bionac-backports',
5857
pin: { 'priority' => 200, 'release' => 'bionac-backports' })

0 commit comments

Comments
 (0)