Andrew Bogott has submitted this change and it was merged.
Change subject: Move the puppetmaster private link yet again.
......................................................................
Move the puppetmaster private link yet again.
Move the template dir back to the default,
/etc/puppet/templates. I don't know why it was
moved.
Change-Id: Ia186fbead0ba6fcac2ed6572c75faf7666288736
---
M manifests/puppetmaster.pp
M templates/puppet/puppet.conf.d/20-master.conf.erb
2 files changed, 1 insertion(+), 2 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/puppetmaster.pp b/manifests/puppetmaster.pp
index 31d2a25..c3029eb 100644
--- a/manifests/puppetmaster.pp
+++ b/manifests/puppetmaster.pp
@@ -219,7 +219,7 @@
target => "${gitdir}/operations/puppet/modules",
force => true,
}
- file { '/etc/private':
+ file { '/etc/puppet/private':
ensure => link,
target => "${gitdir}/operations/private",
force => true,
diff --git a/templates/puppet/puppet.conf.d/20-master.conf.erb
b/templates/puppet/puppet.conf.d/20-master.conf.erb
index e186893..d94fea3 100644
--- a/templates/puppet/puppet.conf.d/20-master.conf.erb
+++ b/templates/puppet/puppet.conf.d/20-master.conf.erb
@@ -2,7 +2,6 @@
[master]
ca_md = sha1
certname = <%= scope.lookupvar('puppetmaster::server_name') %>
-templatedir = /var/lib/puppet/templates
# puppetmaster($config) settings
<% scope.lookupvar('puppetmaster::config').sort.each do |setting, value| -%>
--
To view, visit https://gerrit.wikimedia.org/r/75503
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia186fbead0ba6fcac2ed6572c75faf7666288736
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
