Herron has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/389490 )
Change subject: puppet: add conditional for puppetmaster rack path
......................................................................
puppet: add conditional for puppetmaster rack path
Debian puppet 4.8.x packages have a different naming convention and place
files under a new path. This updates the Apache backend configuration
template to use the new path when puppet 4 is selected.
Depends on T178825
Bug: T179720
Change-Id: I5efb0fc1b1478aa2470abb1f4ad4a4024c6b5e33
---
M modules/puppetmaster/manifests/init.pp
M modules/puppetmaster/templates/puppetmaster-backend.conf.erb
2 files changed, 8 insertions(+), 2 deletions(-)
Approvals:
Herron: Looks good to me, approved
Alexandros Kosiaris: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/puppetmaster/manifests/init.pp
b/modules/puppetmaster/manifests/init.pp
index 2fc9a50..6733281 100644
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -108,6 +108,12 @@
$ssl_settings = ssl_ciphersuite('apache', 'compat')
+ # path and name change with puppet 4 packages
+ $puppetmaster_rack_path = $puppet_major_version ? {
+ 4 => '/usr/share/puppet/rack/puppet-master',
+ default => '/usr/share/puppet/rack/puppetmasterd',
+ }
+
# Part dependent on the server_type
case $server_type {
'frontend': {
diff --git a/modules/puppetmaster/templates/puppetmaster-backend.conf.erb
b/modules/puppetmaster/templates/puppetmaster-backend.conf.erb
index 84e9284..eb3bd39 100644
--- a/modules/puppetmaster/templates/puppetmaster-backend.conf.erb
+++ b/modules/puppetmaster/templates/puppetmaster-backend.conf.erb
@@ -20,8 +20,8 @@
<%- end -%>
</Location>
- DocumentRoot /usr/share/puppet/rack/puppetmasterd/public
- <Directory /usr/share/puppet/rack/puppetmasterd/>
+ DocumentRoot <%= @puppetmaster_rack_path %>/public
+ <Directory <%= @puppetmaster_rack_path %>/>
Options None
AllowOverride None
Require all granted
--
To view, visit https://gerrit.wikimedia.org/r/389490
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5efb0fc1b1478aa2470abb1f4ad4a4024c6b5e33
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Herron <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Herron <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
