Skip to content

Remove apt-transport-https package install #504

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

Merged
truthbk merged 3 commits into from
Mar 22, 2019
Merged

Remove apt-transport-https package install #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f174767
removing noisy unnecessary exec
fr3nd Mar 14, 2019
832dfeb
Requiring minimum version 4.4.0 (when apt-transport-https is installed)
fr3nd Mar 14, 2019
2ecce65
Merge branch 'master' into master
truthbk Mar 22, 2019
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
6 changes: 2 additions & 4 deletions manifests/ubuntu/agent5.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@
Optional[String] $apt_keyserver = undef,
) inherits datadog_agent::params{

ensure_packages(['apt-transport-https'])

if !$skip_apt_key_trusting {
::datadog_agent::ubuntu::install_key { [$apt_key]:
server => $apt_keyserver,
Expand Down Expand Up @@ -67,8 +65,8 @@
location => $location,
release => $release,
repos => $repos,
require => Package['apt-transport-https'],
notify => [Exec['datadog_apt-get_remove_agent6'],Exec['apt_update']],
require => Class['apt'],
notify => Exec['datadog_apt-get_remove_agent6'],
}

package { 'datadog-agent-base':
Expand Down
4 changes: 1 addition & 3 deletions manifests/ubuntu/agent6.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
Optional[String] $apt_keyserver = undef,
) inherits datadog_agent::params {

ensure_packages(['apt-transport-https'])
if !$skip_apt_key_trusting {
::datadog_agent::ubuntu::install_key { [$apt_key]:
server => $apt_keyserver,
Expand All @@ -33,8 +32,7 @@
location => $location,
release => $release,
repos => $repos,
require => Package['apt-transport-https'],
notify => Exec['apt_update'],
require => Class['apt'],
}

package { 'datadog-agent-base':
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
},
{
"name": "puppetlabs/apt",
"version_requirement": ">=2.4.0 <5.0.0"
"version_requirement": ">=4.4.0 <5.0.0"
},
{
"name": "puppetlabs/puppetserver_gem",
Expand Down
8 changes: 0 additions & 8 deletions spec/classes/datadog_agent_ubuntu_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@
it { should contain_exec('apt_update') }

# it should install the packages
it do
should contain_package('apt-transport-https')\
.that_comes_before('file[/etc/apt/sources.list.d/datadog.list]')
end
it do
should contain_package('datadog-agent-base')\
.with_ensure('absent')\
Expand Down Expand Up @@ -101,10 +97,6 @@
it { should contain_exec('apt_update') }

# it should install the packages
it do
should contain_package('apt-transport-https')\
.that_comes_before('file[/etc/apt/sources.list.d/datadog6.list]')
end
it do
should contain_package('datadog-agent-base')\
.with_ensure('absent')\
Expand Down
⚡