Skip to content

Commit 2e67bb2

Browse files
authored
Use ensure_packages to install gnupg (DataDog#714)
* Use `ensure_packages` to install `gnupg` The `apt` module requires this since v7.2.0 which would make the module fail under certain situations on Ubuntu * Add to changelog
1 parent 8f02c93 commit 2e67bb2

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Changes
77
* [FEATURE] Install datadog-signing-keys on Debian based platforms ([#709][])
88
* [BUGFIX] Do not add process integration configuration file if not configured ([#703][]) (Thanks [@yanjunding][])
99
* [FEATURE] add support for `min_collection_interval` for HTTP check ([#699][]) (Thanks [@yanjunding][])
10-
* [FEATURE] Improvements for APT keys management ([#698][], [#700][] and [#701][])
10+
* [FEATURE] Improvements for APT keys management ([#698][], [#700][], [#701][] and [#714][])
1111
* [FEATURE] Include 'datadog_agent' class in the catalog when using the generic integration ([#697][]) (Thanks [@stantona][])
1212
* [BUGFIX] Update `excluded_interface_re` type to String ([#696][]) (Thanks [@florusboth][])
1313

@@ -856,6 +856,7 @@ Please read the [docs]() for more details.
856856
[#703]: https://github.com/DataDog/puppet-datadog-agent/issues/703
857857
[#709]: https://github.com/DataDog/puppet-datadog-agent/issues/709
858858
[#712]: https://github.com/DataDog/puppet-datadog-agent/issues/712
859+
[#714]: https://github.com/DataDog/puppet-datadog-agent/issues/714
859860
[@Aramack]: https://github.com/Aramack
860861
[@BIAndrews]: https://github.com/BIAndrews
861862
[@ChannoneArif-nbcuni]: https://github.com/ChannoneArif-nbcuni
@@ -970,4 +971,4 @@ Please read the [docs]() for more details.
970971
[@yrcjaya]: https://github.com/yrcjaya
971972
[@zabacad]: https://github.com/zabacad
972973
[@zickzackv]: https://github.com/zickzackv
973-
[@zoom-kris-anderson]: https://github.com/zoom-kris-anderson
974+
[@zoom-kris-anderson]: https://github.com/zoom-kris-anderson

manifests/ubuntu.pp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@
3434
}
3535

3636
if !$skip_apt_key_trusting {
37-
package { 'gnupg':
38-
ensure => installed
39-
}
37+
ensure_packages(['gnupg'])
4038

4139
file { $apt_usr_share_keyring:
4240
ensure => file,

0 commit comments

Comments
 (0)