Skip to content

Commit 231e906

Browse files
authored
[yum] fix rhel chatty behavior. (DataDog#341)
* [yum] fix rhel chatty behavior. * [ci] `hiera-eyaml` already in test group, where I believe it belongs.
1 parent ccf287c commit 231e906

2 files changed

Lines changed: 1 addition & 8 deletions

File tree

Gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ group :development do
1717
gem "beaker-rspec"
1818
gem "beaker", '2.51.0'
1919
gem "guard-rake"
20-
gem "hiera-eyaml"
2120
gem "nokogiri", "~> 1.6.0"
2221
gem "puppet-blacksmith"
2322
gem "xmlrpc" if RUBY_VERSION >= '2.3'

manifests/redhat.pp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
validate_bool($manage_repo)
2525
if $manage_repo {
26-
$public_key_local = '/tmp/DATADOG_RPM_KEY.public'
26+
$public_key_local = '/etc/pki/rpm-gpg/DATADOG_RPM_KEY.public'
2727

2828
validate_string($baseurl)
2929

@@ -40,12 +40,6 @@
4040
onlyif => "/usr/bin/gpg --quiet --with-fingerprint -n ${public_key_local} | grep \'A4C0 B90D 7443 CF6E 4E8A A341 F106 8E14 E094 22B3\'",
4141
unless => '/bin/rpm -q gpg-pubkey-e09422b3',
4242
require => Remote_file['DATADOG_RPM_KEY.public'],
43-
notify => Exec['cleanup-gpg-key'],
44-
}
45-
46-
exec { 'cleanup-gpg-key':
47-
command => "/bin/rm ${public_key_local}",
48-
onlyif => "/usr/bin/test -f ${public_key_local}",
4943
}
5044

5145
yumrepo {'datadog':

0 commit comments

Comments
 (0)