Skip to content

[yum] fix rhel chatty behavior. #341

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 2 commits into from
Jul 21, 2017
Merged

[yum] fix rhel chatty behavior. #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1bd56e
[yum] fix rhel chatty behavior.
truthbk Jul 20, 2017
c636fa9
[ci] `hiera-eyaml` already in test group, where I believe it belongs.
truthbk Jul 20, 2017
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
1 change: 0 additions & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ group :development do
gem "beaker-rspec"
gem "beaker", '2.51.0'
gem "guard-rake"
gem "hiera-eyaml"
gem "nokogiri", "~> 1.6.0"
gem "puppet-blacksmith"
gem "xmlrpc" if RUBY_VERSION >= '2.3'
Expand Down
8 changes: 1 addition & 7 deletions manifests/redhat.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

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

validate_string($baseurl)

Expand All @@ -40,12 +40,6 @@
onlyif => "/usr/bin/gpg --quiet --with-fingerprint -n ${public_key_local} | grep \'A4C0 B90D 7443 CF6E 4E8A A341 F106 8E14 E094 22B3\'",
unless => '/bin/rpm -q gpg-pubkey-e09422b3',
require => Remote_file['DATADOG_RPM_KEY.public'],
notify => Exec['cleanup-gpg-key'],
}

exec { 'cleanup-gpg-key':
command => "/bin/rm ${public_key_local}",
onlyif => "/usr/bin/test -f ${public_key_local}",
}

yumrepo {'datadog':
Expand Down
⚡