Andrew Bogott has submitted this change and it was merged.
Change subject: Slight rearranging
......................................................................
Slight rearranging
Change-Id: I98af2e52089524fb87be7a7cba87d4dbf7c5d4fb
---
M templates/puppet/puppet.conf.d/20-master.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/puppet/puppet.conf.d/20-master.conf.erb
b/templates/puppet/puppet.conf.d/20-master.conf.erb
index a4e1494..8fabe8f 100644
--- a/templates/puppet/puppet.conf.d/20-master.conf.erb
+++ b/templates/puppet/puppet.conf.d/20-master.conf.erb
@@ -3,6 +3,7 @@
ca_md = sha1
certname = <%= scope.lookupvar('puppetmaster::server_name') %>
templatedir = /etc/puppet/templates
+modulepath = /etc/puppet/private/modules:/etc/puppet/modules
# puppetmaster($config) settings
<% scope.lookupvar('puppetmaster::config').sort.each do |setting, value| -%>
@@ -15,4 +16,3 @@
ssl_client_verify_header = SSL_CLIENT_VERIFY
hostcert = /var/lib/puppet/server/ssl/certs/<%= fqdn %>.pem
hostprivkey = /var/lib/puppet/server/ssl/private_keys/<%= fqdn %>.pem
-modulepath = /etc/puppet/private/modules:/etc/puppet/modules
--
To view, visit https://gerrit.wikimedia.org/r/76621
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I98af2e52089524fb87be7a7cba87d4dbf7c5d4fb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
