Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: lvs: add loadbalancers for appservers, api and rendering
......................................................................
lvs: add loadbalancers for appservers, api and rendering
Bug: T92377
Change-Id: I4e76e44ed80304ed7c236678859e0e9158b4afcb
---
M manifests/role/lvs.pp
M modules/lvs/manifests/configuration.pp
2 files changed, 9 insertions(+), 3 deletions(-)
Approvals:
Filippo Giunchedi: Looks good to me, but someone else must approve
Giuseppe Lavagetto: Looks good to me, approved
Alexandros Kosiaris: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/manifests/role/lvs.pp b/manifests/role/lvs.pp
index e82053a..37b6b44 100644
--- a/manifests/role/lvs.pp
+++ b/manifests/role/lvs.pp
@@ -55,6 +55,9 @@
$sip['dns_rec'][$::site],
],
/^(lvs200[36])$/ => [
+ $sip['apaches'][$::site],
+ $sip['api'][$::site],
+ $sip['rendering'][$::site],
$sip['swift'][$::site],
],
diff --git a/modules/lvs/manifests/configuration.pp
b/modules/lvs/manifests/configuration.pp
index f2759cd..f1a9703 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -123,12 +123,15 @@
},
'apaches' => {
'eqiad' => "10.2.2.1",
+ 'codfw' => '10.2.1.1',
},
'rendering' => {
'eqiad' => "10.2.2.21",
+ 'codfw' => "10.2.1.21",
},
'api' => {
'eqiad' => "10.2.2.22",
+ 'codfw' => '10.2.1.22',
},
'mobile' => {
'eqiad' => { 'mobilelb' => "208.80.154.236", 'mobilelb6' =>
'2620:0:861:ed1a::1:c', 'mobilesvc' => "10.2.2.26"},
@@ -508,7 +511,7 @@
"apaches" => {
'description' => "Main MediaWiki application server cluster,
appservers.svc.eqiad.wmnet",
'class' => "low-traffic",
- 'sites' => [ "eqiad" ],
+ 'sites' => [ "eqiad", 'codfw' ],
'ip' => $service_ips['apaches'][$::site],
'bgp' => "yes",
'depool-threshold' => ".9",
@@ -523,7 +526,7 @@
"rendering" => {
'description' => "MediaWiki thumbnail rendering cluster,
rendering.svc.eqiad.wmnet",
'class' => "low-traffic",
- 'sites' => [ "eqiad" ],
+ 'sites' => [ "eqiad", 'codfw' ],
'ip' => $service_ips['rendering'][$::site],
'bgp' => "yes",
'depool-threshold' => ".74",
@@ -538,7 +541,7 @@
"api" => {
'description' => "MediaWiki API cluster, api.svc.eqiad.wmnet",
'class' => "low-traffic",
- 'sites' => [ "eqiad" ],
+ 'sites' => [ "eqiad", 'codfw' ],
'ip' => $service_ips['api'][$::site],
'bgp' => "yes",
'depool-threshold' => ".6",
--
To view, visit https://gerrit.wikimedia.org/r/195899
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4e76e44ed80304ed7c236678859e0e9158b4afcb
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[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
