BBlack has submitted this change and it was merged.
Change subject: cache_misc - Add full set of services to conftool data
......................................................................
cache_misc - Add full set of services to conftool data
Bug: T119394
Change-Id: I49053ba8c09447a3e3786370349953fdd295d6fc
---
M conftool-data/nodes/codfw.yaml
M conftool-data/nodes/eqiad.yaml
M conftool-data/nodes/esams.yaml
M conftool-data/nodes/ulsfo.yaml
M conftool-data/services/cache.yaml
5 files changed, 45 insertions(+), 4 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/conftool-data/nodes/codfw.yaml b/conftool-data/nodes/codfw.yaml
index c134ba4..ca15ac4 100644
--- a/conftool-data/nodes/codfw.yaml
+++ b/conftool-data/nodes/codfw.yaml
@@ -220,6 +220,11 @@
cache_parsoid:
cp2022.codfw.wmnet: [varnish-fe, varnish-be, nginx]
cp2026.codfw.wmnet: [varnish-fe, varnish-be, nginx]
+cache_misc:
+ cp2006.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp2012.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp2018.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp2025.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
swift:
ms-fe2001.codfw.wmnet: [swift-fe]
ms-fe2002.codfw.wmnet: [swift-fe]
diff --git a/conftool-data/nodes/eqiad.yaml b/conftool-data/nodes/eqiad.yaml
index 9942df1..01eceb5 100644
--- a/conftool-data/nodes/eqiad.yaml
+++ b/conftool-data/nodes/eqiad.yaml
@@ -278,10 +278,10 @@
cp1045.eqiad.wmnet: [varnish-fe, varnish-be, nginx]
cp1058.eqiad.wmnet: [varnish-fe, varnish-be, nginx]
cache_misc:
- cp1056.eqiad.wmnet: [varnish-fe, nginx]
- cp1057.eqiad.wmnet: [varnish-fe, nginx]
- cp1069.eqiad.wmnet: [varnish-fe, nginx]
- cp1070.eqiad.wmnet: [varnish-fe, nginx]
+ cp1056.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp1057.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp1069.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp1070.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
parsoid:
wtp1001.eqiad.wmnet: [parsoid]
wtp1002.eqiad.wmnet: [parsoid]
diff --git a/conftool-data/nodes/esams.yaml b/conftool-data/nodes/esams.yaml
index 6972755..42c9546 100644
--- a/conftool-data/nodes/esams.yaml
+++ b/conftool-data/nodes/esams.yaml
@@ -37,6 +37,11 @@
cp3047.esams.wmnet: [varnish-fe, varnish-be, nginx]
cp3048.esams.wmnet: [varnish-fe, varnish-be, nginx]
cp3049.esams.wmnet: [varnish-fe, varnish-be, nginx]
+cache_misc:
+ cp3019.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp3020.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp3021.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp3022.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
dns:
maerlant.wikimedia.org: [pdns_recursor]
nescio.wikimedia.org: [pdns_recursor]
diff --git a/conftool-data/nodes/ulsfo.yaml b/conftool-data/nodes/ulsfo.yaml
index 2f689ac..e531d97 100644
--- a/conftool-data/nodes/ulsfo.yaml
+++ b/conftool-data/nodes/ulsfo.yaml
@@ -17,3 +17,8 @@
cp4013.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
cp4014.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
cp4015.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
+cache_misc:
+ cp4001.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp4002.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp4003.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp4004.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
diff --git a/conftool-data/services/cache.yaml
b/conftool-data/services/cache.yaml
index be09e92..8640b08 100644
--- a/conftool-data/services/cache.yaml
+++ b/conftool-data/services/cache.yaml
@@ -140,14 +140,40 @@
"pooled": "no"
"weight": 1
datacenters:
+ - codfw
- eqiad
+ - esams
+ - ulsfo
+ varnish-be:
+ port: 3128
+ default_values:
+ "pooled": "no"
+ "weight": 1
+ datacenters:
+ - codfw
+ - eqiad
+ - esams
+ - ulsfo
+ varnish-be-rand:
+ port: 3128
+ default_values:
+ "pooled": "no"
+ "weight": 1
+ datacenters:
+ - codfw
+ - eqiad
+ - esams
+ - ulsfo
nginx:
port: 443
default_values:
"pooled": "no"
"weight": 1
datacenters:
+ - codfw
- eqiad
+ - esams
+ - ulsfo
cache_parsoid:
varnish-fe:
port: 80
--
To view, visit https://gerrit.wikimedia.org/r/255375
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I49053ba8c09447a3e3786370349953fdd295d6fc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
