Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: noc: point misc-varnish to mw1152 for both noc and dbtree
......................................................................
noc: point misc-varnish to mw1152 for both noc and dbtree
Change-Id: I9f79eeddcb20fa9bbea4511b841b80718bd2a621
---
M modules/role/manifests/cache/misc.pp
M templates/varnish/misc.inc.vcl.erb
2 files changed, 6 insertions(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
BBlack: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/role/manifests/cache/misc.pp
b/modules/role/manifests/cache/misc.pp
index 51adc04..b90fcc0 100644
--- a/modules/role/manifests/cache/misc.pp
+++ b/modules/role/manifests/cache/misc.pp
@@ -105,6 +105,11 @@
'type' => 'random',
'backends' => ['netmon1001.wikimedia.org'],
},
+ 'noc' => { # noc.wikimedia.org and dbtree.wikimedia.org
+ 'dynamic' => 'no',
+ 'type' => 'random',
+ 'backends' => ['mw1152.eqiad.wmnet'],
+ },
'palladium' => {
'dynamic' => 'no',
'type' => 'random',
diff --git a/templates/varnish/misc.inc.vcl.erb
b/templates/varnish/misc.inc.vcl.erb
index a363423..995a3ee 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -79,7 +79,7 @@
// No caching of configs; scripts may want to know when things change
return (pass);
} elsif (req.http.Host == "noc.wikimedia.org" || req.http.Host ==
"dbtree.wikimedia.org") {
- set req.backend = terbium;
+ set req.backend = noc;
} elsif (req.http.Host == "scholarships.wikimedia.org" || req.http.Host ==
"iegreview.wikimedia.org") {
set req.backend = krypton;
} elsif (req.http.Host == "hue.wikimedia.org") {
--
To view, visit https://gerrit.wikimedia.org/r/251227
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9f79eeddcb20fa9bbea4511b841b80718bd2a621
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
