Skip to content

Commit

Permalink
Use ensure_packages to install gnupg (#714)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
mx-psi authored Aug 11, 2021
1 parent 2656a6d commit 9aa9bc8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Changes
* [FEATURE] Install datadog-signing-keys on Debian based platforms ([#709][])
* [BUGFIX] Do not add process integration configuration file if not configured ([#703][]) (Thanks [@yanjunding][])
* [FEATURE] add support for `min_collection_interval` for HTTP check ([#699][]) (Thanks [@yanjunding][])
* [FEATURE] Improvements for APT keys management ([#698][], [#700][] and [#701][])
* [FEATURE] Improvements for APT keys management ([#698][], [#700][], [#701][] and [#714][])
* [FEATURE] Include 'datadog_agent' class in the catalog when using the generic integration ([#697][]) (Thanks [@stantona][])
* [BUGFIX] Update `excluded_interface_re` type to String ([#696][]) (Thanks [@florusboth][])

Expand Down Expand Up @@ -856,6 +856,7 @@ Please read the [docs]() for more details.
[#703]: https://github.com/DataDog/puppet-datadog-agent/issues/703
[#709]: https://github.com/DataDog/puppet-datadog-agent/issues/709
[#712]: https://github.com/DataDog/puppet-datadog-agent/issues/712
[#714]: https://github.com/DataDog/puppet-datadog-agent/issues/714
[@Aramack]: https://github.com/Aramack
[@BIAndrews]: https://github.com/BIAndrews
[@ChannoneArif-nbcuni]: https://github.com/ChannoneArif-nbcuni
Expand Down Expand Up @@ -970,4 +971,4 @@ Please read the [docs]() for more details.
[@yrcjaya]: https://github.com/yrcjaya
[@zabacad]: https://github.com/zabacad
[@zickzackv]: https://github.com/zickzackv
[@zoom-kris-anderson]: https://github.com/zoom-kris-anderson
[@zoom-kris-anderson]: https://github.com/zoom-kris-anderson
4 changes: 1 addition & 3 deletions manifests/ubuntu.pp
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@
}

if !$skip_apt_key_trusting {
package { 'gnupg':
ensure => installed
}
ensure_packages(['gnupg'])

file { $apt_usr_share_keyring:
ensure => file,
Expand Down

0 comments on commit 9aa9bc8

Please sign in to comment.