Gehel has submitted this change and it was merged.
Change subject: cache_maps: add all sites in LVS
......................................................................
cache_maps: add all sites in LVS
Bug: T109162
Change-Id: If0ced5f4e59314e92b8033ba417ced17098149e7
---
M hieradata/common/lvs/configuration.yaml
M modules/role/manifests/lvs/balancer.pp
2 files changed, 9 insertions(+), 0 deletions(-)
Approvals:
Gehel: Verified; Looks good to me, approved
diff --git a/hieradata/common/lvs/configuration.yaml
b/hieradata/common/lvs/configuration.yaml
index c8221c8..8c1f024 100644
--- a/hieradata/common/lvs/configuration.yaml
+++ b/hieradata/common/lvs/configuration.yaml
@@ -240,7 +240,10 @@
description: "Maps service maps-lb.%{::site}.wikimedia.org"
class: high-traffic2
sites:
+ - codfw
- eqiad
+ - esams
+ - ulsfo
ip: *ip_block003
bgp: 'yes'
depool-threshold: '.5'
@@ -255,7 +258,10 @@
description: "Maps service maps-lb.%{::site}.wikimedia.org"
class: high-traffic2
sites:
+ - codfw
- eqiad
+ - esams
+ - ulsfo
ip: *ip_block003
port: 443
scheduler: sh
diff --git a/modules/role/manifests/lvs/balancer.pp
b/modules/role/manifests/lvs/balancer.pp
index 5263e74..f4f5a3a 100644
--- a/modules/role/manifests/lvs/balancer.pp
+++ b/modules/role/manifests/lvs/balancer.pp
@@ -49,6 +49,7 @@
],
/^(lvs200[25])$/ => [
$sip['upload'][$::site],
+ $sip['maps'][$::site],
$sip['misc_web'][$::site],
$sip['dns_rec'][$::site],
],
@@ -76,11 +77,13 @@
],
/^(lvs300[24])$/ => [
$sip['upload'][$::site],
+ $sip['maps'][$::site],
$sip['misc_web'][$::site],
$sip['dns_rec'][$::site],
],
/^(lvs400[24])$/ => [
$sip['upload'][$::site],
+ $sip['maps'][$::site],
$sip['misc_web'][$::site],
],
}
--
To view, visit https://gerrit.wikimedia.org/r/268238
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If0ced5f4e59314e92b8033ba417ced17098149e7
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
