diff --git a/manifests/ubuntu/agent5.pp b/manifests/ubuntu/agent5.pp index 0f1997b8..e3985f61 100644 --- a/manifests/ubuntu/agent5.pp +++ b/manifests/ubuntu/agent5.pp @@ -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, @@ -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': diff --git a/manifests/ubuntu/agent6.pp b/manifests/ubuntu/agent6.pp index 695f4ae8..bd9953e0 100644 --- a/manifests/ubuntu/agent6.pp +++ b/manifests/ubuntu/agent6.pp @@ -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, @@ -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': diff --git a/metadata.json b/metadata.json index 618a0a90..fb3384ce 100644 --- a/metadata.json +++ b/metadata.json @@ -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", diff --git a/spec/classes/datadog_agent_ubuntu_spec.rb b/spec/classes/datadog_agent_ubuntu_spec.rb index da68ed30..9c1dc1ff 100644 --- a/spec/classes/datadog_agent_ubuntu_spec.rb +++ b/spec/classes/datadog_agent_ubuntu_spec.rb @@ -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')\ @@ -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')\