Filippo Giunchedi has submitted this change and it was merged.
Change subject: restbase: add LVS codfw configuration
......................................................................
restbase: add LVS codfw configuration
Bug: T108613
Change-Id: Ia4b4b1e16f35eb2bf473e89a47d28b1f3354f7bf
---
M conftool-data/nodes/codfw.yaml
M conftool-data/services/services.yaml
M hieradata/common/lvs/configuration.yaml
M modules/role/manifests/lvs/balancer.pp
4 files changed, 16 insertions(+), 3 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/conftool-data/nodes/codfw.yaml b/conftool-data/nodes/codfw.yaml
index e32dffc..c134ba4 100644
--- a/conftool-data/nodes/codfw.yaml
+++ b/conftool-data/nodes/codfw.yaml
@@ -258,3 +258,10 @@
elastic2022.codfw.wmnet: [elasticsearch]
elastic2023.codfw.wmnet: [elasticsearch]
elastic2024.codfw.wmnet: [elasticsearch]
+restbase:
+ restbase2001.codfw.wmnet: [restbase]
+ restbase2002.codfw.wmnet: [restbase]
+ restbase2003.codfw.wmnet: [restbase]
+ restbase2004.codfw.wmnet: [restbase]
+ restbase2005.codfw.wmnet: [restbase]
+ restbase2006.codfw.wmnet: [restbase]
diff --git a/conftool-data/services/services.yaml
b/conftool-data/services/services.yaml
index 969e4af..fcb1231 100644
--- a/conftool-data/services/services.yaml
+++ b/conftool-data/services/services.yaml
@@ -92,6 +92,7 @@
weight: 10
datacenters:
- eqiad
+ - codfw
maps:
kartotherian:
port: 6533
diff --git a/hieradata/common/lvs/configuration.yaml
b/hieradata/common/lvs/configuration.yaml
index 3001294..1bf8e7b 100644
--- a/hieradata/common/lvs/configuration.yaml
+++ b/hieradata/common/lvs/configuration.yaml
@@ -94,6 +94,7 @@
eqiad: 10.2.2.15
restbase: &ip_block020
eqiad: 10.2.2.17
+ codfw: 10.2.1.17
zotero: &ip_block021
eqiad: 10.2.2.16
kartotherian: &ip_block022
@@ -747,10 +748,11 @@
eqiad:
hostname: graphoid.svc.eqiad.wmnet
restbase:
- description: RESTBase, restbase.svc.eqiad.wmnet
+ description: "RESTBase, restbase.svc.%{::site}.wmnet"
class: low-traffic
sites:
- eqiad
+ - codfw
ip: *ip_block020
port: 7231
bgp: 'yes'
@@ -758,7 +760,7 @@
monitors:
ProxyFetch:
url:
- - http://restbase.svc.eqiad.wmnet
+ - "http://restbase.svc.%{::site}.wmnet";
IdleConnection:
timeout-clean-reconnect: 3
max-delay: 300
@@ -766,10 +768,12 @@
cluster: restbase
service: restbase
icinga:
- check_command: check_http_lvs_on_port!restbase.svc.eqiad.wmnet!7231!/
+ check_command:
"check_http_lvs_on_port!restbase.svc.%{::site}.wmnet!7231!/"
sites:
eqiad:
hostname: restbase.svc.eqiad.wmnet
+ codfw:
+ hostname: restbase.svc.codfw.wmnet
zotero:
description: Zotero, zotero.svc.eqiad.wmnet
class: low-traffic
diff --git a/modules/role/manifests/lvs/balancer.pp
b/modules/role/manifests/lvs/balancer.pp
index 7574e2f..5478edf 100644
--- a/modules/role/manifests/lvs/balancer.pp
+++ b/modules/role/manifests/lvs/balancer.pp
@@ -58,6 +58,7 @@
$sip['swift'][$::site],
$sip['search'][$::site],
$sip['kartotherian'][$::site],
+ $sip['restbase'][$::site],
],
# esams + ulsfo
--
To view, visit https://gerrit.wikimedia.org/r/240088
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4b4b1e16f35eb2bf473e89a47d28b1f3354f7bf
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Eevans <eev...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: GWicke <gwi...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
