Skip to content

Revert "Adopt to latest puppetlabs/apt changes" #744

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
joshcooper wants to merge 1 commit into from
Closed

Revert "Adopt to latest puppetlabs/apt changes" #744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions manifests/osfamily/debian.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,13 @@
# Pass in an empty content string since apt requires it even though we are removing it
apt::setting { 'list-puppet-enterprise-installer':
ensure => absent,
content => '',
}

apt::setting { 'conf-pe-repo':
ensure => absent,
priority => '90',
content => '',
}
} else {
$source = $puppet_agent::apt_source
Expand Down
4 changes: 3 additions & 1 deletion spec/classes/puppet_agent_osfamily_debian_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,16 @@
is_expected.to contain_apt__setting('conf-pe-repo')
.with({
'priority' => 90,
'content' => '',
'ensure' => 'absent',
})
}

it {
is_expected.to contain_apt__setting('list-puppet-enterprise-installer')
.with({
'ensure' => 'absent',
'content' => '',
'ensure' => 'absent',
})
}
end
Expand Down