Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59541
Change subject: Explicitly defining relationship between cert generate and
compile puppet.conf
......................................................................
Explicitly defining relationship between cert generate and compile puppet.conf
Change-Id: Ifa1a29fa19bec34ac248e78dd3568442f1660f20
---
M manifests/puppetmaster.pp
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/41/59541/1
diff --git a/manifests/puppetmaster.pp b/manifests/puppetmaster.pp
index cb892c9..a728fa6 100644
--- a/manifests/puppetmaster.pp
+++ b/manifests/puppetmaster.pp
@@ -579,10 +579,13 @@
# means the cert generate won't run there, and I can run my own
# and add dependencies here.
exec { 'generate puppet::self hostcert':
- require => [Class['puppetmaster::ssl'], Exec['compile
puppet.conf']],
+ require => Class['puppetmaster::ssl'],
command => "/usr/bin/puppet cert generate
${server_name}",
creates => "${ssldir}/certs/${server_name}.pem",
}
+
+ # Make sure puppet.conf file is compiled before puppet cert
generate
+ Exec['compile puppet.conf'] { before => Exec['generate
puppet::self hostcert'] }
}
else {
$ssldir = '/var/lib/puppet/client/ssl'
--
To view, visit https://gerrit.wikimedia.org/r/59541
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifa1a29fa19bec34ac248e78dd3568442f1660f20
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
