Tim Landscheidt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226455
Change subject: Labs: Fix puppetmaster::certcleaner for self-hosted puppet
masters
......................................................................
Labs: Fix puppetmaster::certcleaner for self-hosted puppet masters
For Labs instances, no Hiera configuration for labs_puppet_master is
defined. This breaks puppetmaster::certcleaner which is included on
self-hosted puppet masters.
This change sets the default for the Hiera look-up to the FQDN, thus
effectively making it a no-op as certcleaner.py already skips entries
with the FQDN.
Bug: T106627
Change-Id: I30464f2dd69b1c92023e5829a14e669a2fec8414
---
M modules/puppetmaster/manifests/certcleaner.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/55/226455/1
diff --git a/modules/puppetmaster/manifests/certcleaner.pp
b/modules/puppetmaster/manifests/certcleaner.pp
index a9e8365..db6bde3 100644
--- a/modules/puppetmaster/manifests/certcleaner.pp
+++ b/modules/puppetmaster/manifests/certcleaner.pp
@@ -2,7 +2,7 @@
# Automatically signs new puppet & salt certificate requests
class puppetmaster::certcleaner {
- $puppetmaster_service_name = hiera('labs_puppet_master')
+ $puppetmaster_service_name = hiera('labs_puppet_master', $::fqdn)
file { '/usr/local/sbin/certcleaner.py':
ensure => present,
--
To view, visit https://gerrit.wikimedia.org/r/226455
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I30464f2dd69b1c92023e5829a14e669a2fec8414
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
