Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: config-master: serve through misc-web-lb
......................................................................


config-master: serve through misc-web-lb

Change-Id: I84a42ea0e1032b0be0c8c53748924bf412d34872
Signed-off-by: Giuseppe Lavagetto <glavage...@wikimedia.org>
---
M manifests/role/pybal_config.pp
M templates/varnish/misc.inc.vcl.erb
2 files changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/role/pybal_config.pp b/manifests/role/pybal_config.pp
index 6ab2e98..f1a5247 100644
--- a/manifests/role/pybal_config.pp
+++ b/manifests/role/pybal_config.pp
@@ -7,6 +7,7 @@
                        'config-master.codfw.wmnet',
                        'config-master.esams.wmnet',
                        'config-master.ulsfo.wmnet',
+                       'config-master.wikimedia.org',
                        ]
     }
 }
diff --git a/templates/varnish/misc.inc.vcl.erb 
b/templates/varnish/misc.inc.vcl.erb
index 17798d5..bcd6784 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -40,6 +40,10 @@
                set req.backend = magnesium;
        } elsif (req.http.Host == "metrics.wikimedia.org") {
                set req.backend = stat1001;
+       } elsif (req.http.Host == "config-master.wikimedia.org") {
+               set req.backend = palladium;
+               /* no caching of configs; scripts may want to know when things 
change */
+               return (pass);
        } else {
                error 404 "Domain not served here";
        }

-- 
To view, visit https://gerrit.wikimedia.org/r/161915
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I84a42ea0e1032b0be0c8c53748924bf412d34872
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to