Skip to content

Add a backup keyserver in case the main one is down#470

Merged
remicalixte merged 3 commits intomasterfrom
remicalixte/backup-keyserver
Nov 15, 2018
Merged

Add a backup keyserver in case the main one is down#470
remicalixte merged 3 commits intomasterfrom
remicalixte/backup-keyserver

Conversation

@remicalixte
Copy link
Copy Markdown
Contributor

@remicalixte remicalixte commented Oct 30, 2018

Motivation

We should make sure our APT repo's public GPG key is available from another keyserver (pool) than just keyserver.ubuntu.com so that, when the latter is down.

@remicalixte remicalixte force-pushed the remicalixte/backup-keyserver branch from 985abb5 to 77e247b Compare October 30, 2018 18:53
Copy link
Copy Markdown
Member

@truthbk truthbk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks almost ready, I'd just handle the params on the main manifest a little different. Let me know what you think. Also, it would be nice to cover the keyserver stuff with some spec tests (https://github.com/DataDog/puppet-datadog-agent/blob/master/spec/classes/datadog_agent_ubuntu_spec.rb).

Thank you for this 🙏

Comment thread manifests/init.pp Outdated
$agent6_repo_uri = $datadog_agent::params::agent6_default_repo,
$use_apt_backup_keyserver = $datadog_agent::params::use_apt_backup_keyserver,
$apt_backup_keyserver = 'hkp://pool.sks-keyservers.net:80',
$apt_keyserver = 'hkp://keyserver.ubuntu.com:80',
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hkp://keyserver.ubuntu.com:80 should probably be in $datadog_agent::params.

Also, we should be adding new params using abstract data types:
Optional[String] and Optional[Boolean] or Variant[Enum['true', 'false'], Boolean] (see: https://puppet.com/docs/puppet/5.3/lang_data_abstract.html)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, use_apt_backup_keyserver should be optional. What is the difference between putting a variable in init.pp and in params.pp ? The keyserver url is not meant to be user facing and is not optional because we need one to fetch the pgp key

@remicalixte remicalixte force-pushed the remicalixte/backup-keyserver branch from 77e247b to dc1beb3 Compare November 13, 2018 18:17
@remicalixte remicalixte force-pushed the remicalixte/backup-keyserver branch 4 times, most recently from 05cdf75 to eb92a2a Compare November 13, 2018 20:15
@remicalixte remicalixte force-pushed the remicalixte/backup-keyserver branch from eb92a2a to be4ec4e Compare November 13, 2018 20:21
Copy link
Copy Markdown
Member

@truthbk truthbk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to go! 🚀

@remicalixte remicalixte merged commit 3469134 into master Nov 15, 2018
@remicalixte remicalixte deleted the remicalixte/backup-keyserver branch November 15, 2018 15:13
@truthbk truthbk added this to the 2.4.0 milestone Dec 20, 2018
cegeka-jenkins pushed a commit to cegeka/puppet-datadog_agent that referenced this pull request Apr 6, 2020
Add a backup keyserver in case the main one is down
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants