Ryan Lane has submitted this change and it was merged.
Change subject: Switch testwiki to mw1017 in Varnish too
......................................................................
Switch testwiki to mw1017 in Varnish too
Change-Id: I086a22db99bc708f78716e914295d8f86ab062b6
---
M manifests/role/cache.pp
M manifests/site.pp
2 files changed, 10 insertions(+), 5 deletions(-)
Approvals:
Ryan Lane: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 0e5ac15..0c3b7ff 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -326,8 +326,8 @@
'eqiad' => [ "mw1149.eqiad.wmnet",
"mw1150.eqiad.wmnet", "mw1151.eqiad.wmnet", "mw1152.eqiad.wmnet" ],
},
'test_appservers' => {
- 'pmtpa' => [ "srv193.pmtpa.wmnet" ],
- 'eqiad' => [ "srv193.pmtpa.wmnet" ],
+ 'pmtpa' => [ "mw1017.eqiad.wmnet" ],
+ 'eqiad' => [ "mw1017.eqiad.wmnet" ],
},
'parsoid' =>
$lvs::configuration::lvs_service_ips['production']['parsoid']
},
@@ -570,7 +570,7 @@
'probe' => "varnish",
},
{
- 'backend_match' =>
'^srv193\.pmtpa\.wmnet$',
+ 'backend_match' =>
'^mw1017\.eqiad\.wmnet$',
'max_connections' => 20,
},
{
@@ -937,7 +937,7 @@
},
backend_options => [
{
- 'backend_match' =>
'^srv193\.pmtpa\.wmnet$',
+ 'backend_match' =>
'^mw1017\.eqiad\.wmnet$',
'max_connections' => 20,
},
{
diff --git a/manifests/site.pp b/manifests/site.pp
index 88ba7ac..bd91669 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1965,7 +1965,12 @@
$ganglia_aggregator = true
}
- include role::applicationserver::appserver
+ # mw1017 is test.wikipedia.org (precise)
+ if $::hostname == "mw1017" {
+ include role::applicationserver::appserver::test
+ } else {
+ include role::applicationserver::appserver
+ }
}
# mw1114-1148 are api apaches (precise)
--
To view, visit https://gerrit.wikimedia.org/r/73343
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I086a22db99bc708f78716e914295d8f86ab062b6
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: MaxSem <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
