Herron has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/395832 )
Change subject: puppetmaster: add proxypassmatch rules for puppet 4 url variants
......................................................................
puppetmaster: add proxypassmatch rules for puppet 4 url variants
Add ProxyPassMatch rules to continue pinning puppet certificate,
file bucket and volatile requests to the primary puppet master
(puppetmaster1001) when using puppet 4 agents.
Bug: T177254
Change-Id: Icea73010598f4e51278309562d76de30be440774
---
M modules/puppetmaster/templates/web-frontend.conf.erb
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/32/395832/1
diff --git a/modules/puppetmaster/templates/web-frontend.conf.erb
b/modules/puppetmaster/templates/web-frontend.conf.erb
index 35fcecf..7b64457 100644
--- a/modules/puppetmaster/templates/web-frontend.conf.erb
+++ b/modules/puppetmaster/templates/web-frontend.conf.erb
@@ -28,11 +28,15 @@
SetEnv proxy-initial-not-pooled 1
# Certificates requests should only be in the master.
ProxyPassMatch ^/([^/]+/certificate.*)$ https://<%= @master %>:8141
+ ProxyPassMatch ^/(puppet-ca/.*)$ https://<%= @master %>:8141
# File buckets should only be in one place. Choosing the frontend by
default for simplicity
ProxyPassMatch ^/([^/]+/file_bucket_file/md5/.*)$ https://<%= @fqdn %>:8141
+ ProxyPassMatch ^/(puppet/v3/file_bucket_file/md5/.*)$ https://<%= @fqdn
%>:8141
# Volatile should only be in one place. Choosing the master by default for
simplicity
ProxyPassMatch ^/([^/]+/file_metadata(s)?/volatile/.*)$ https://<%=
@master %>:8141
+ ProxyPassMatch ^/(puppet/v3/file_metadata(s)?/volatile.*)$ https://<%=
@master %>:8141
ProxyPassMatch ^/([^/]+/file_content/volatile/.*)$ https://<%= @master
%>:8141
+ ProxyPassMatch ^/(puppet/v3/file_content/volatile/.*)$ https://<%= @master
%>:8141
# The rest gets balanced
ProxyPass / balancer://mycluster/
<Proxy balancer://mycluster>
--
To view, visit https://gerrit.wikimedia.org/r/395832
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icea73010598f4e51278309562d76de30be440774
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Herron <kher...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
