Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: conftool: add service "varnish-be-rand" to cache text nodes
......................................................................
conftool: add service "varnish-be-rand" to cache text nodes
Change-Id: I07405b5310381d66561b7fedf17e304849abc485
---
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, 47 insertions(+), 37 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/conftool-data/nodes/codfw.yaml b/conftool-data/nodes/codfw.yaml
index 5ebd48c..e2e2679 100644
--- a/conftool-data/nodes/codfw.yaml
+++ b/conftool-data/nodes/codfw.yaml
@@ -195,14 +195,14 @@
mw2150.codfw.wmnet: [apache2]
mw2151.codfw.wmnet: [apache2]
cache_text:
- cp2001.codfw.wmnet: [varnish-fe, varnish-be, nginx]
- cp2004.codfw.wmnet: [varnish-fe, varnish-be, nginx]
- cp2007.codfw.wmnet: [varnish-fe, varnish-be, nginx]
- cp2010.codfw.wmnet: [varnish-fe, varnish-be, nginx]
- cp2013.codfw.wmnet: [varnish-fe, varnish-be, nginx]
- cp2016.codfw.wmnet: [varnish-fe, varnish-be, nginx]
- cp2019.codfw.wmnet: [varnish-fe, varnish-be, nginx]
- cp2023.codfw.wmnet: [varnish-fe, varnish-be, nginx]
+ cp2001.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp2004.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp2007.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp2010.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp2013.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp2016.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp2019.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp2023.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
cache_mobile:
cp2003.codfw.wmnet: [varnish-fe, varnish-be, nginx]
cp2009.codfw.wmnet: [varnish-fe, varnish-be, nginx]
diff --git a/conftool-data/nodes/eqiad.yaml b/conftool-data/nodes/eqiad.yaml
index c6287e6..ca00d56 100644
--- a/conftool-data/nodes/eqiad.yaml
+++ b/conftool-data/nodes/eqiad.yaml
@@ -232,14 +232,14 @@
mw1257.eqiad.wmnet: [apache2]
mw1258.eqiad.wmnet: [apache2]
cache_text:
- cp1052.eqiad.wmnet: [varnish-fe, varnish-be, nginx]
- cp1053.eqiad.wmnet: [varnish-fe, varnish-be, nginx]
- cp1054.eqiad.wmnet: [varnish-fe, varnish-be, nginx]
- cp1055.eqiad.wmnet: [varnish-fe, varnish-be, nginx]
- cp1065.eqiad.wmnet: [varnish-fe, varnish-be, nginx]
- cp1066.eqiad.wmnet: [varnish-fe, varnish-be, nginx]
- cp1067.eqiad.wmnet: [varnish-fe, varnish-be, nginx]
- cp1068.eqiad.wmnet: [varnish-fe, varnish-be, nginx]
+ cp1052.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp1053.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp1054.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp1055.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp1065.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp1066.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp1067.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp1068.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
cache_mobile:
cp1046.eqiad.wmnet: [varnish-fe, varnish-be, nginx]
cp1047.eqiad.wmnet: [varnish-fe, varnish-be, nginx]
diff --git a/conftool-data/nodes/esams.yaml b/conftool-data/nodes/esams.yaml
index bd695e4..00fc89e 100644
--- a/conftool-data/nodes/esams.yaml
+++ b/conftool-data/nodes/esams.yaml
@@ -9,21 +9,21 @@
cp3017.esams.wmnet: [varnish-fe, varnish-be, nginx]
cp3018.esams.wmnet: [varnish-fe, varnish-be, nginx]
cache_text:
- cp3003.esams.wmnet: [varnish-fe, varnish-be, nginx]
- cp3004.esams.wmnet: [varnish-fe, varnish-be, nginx]
- cp3005.esams.wmnet: [varnish-fe, varnish-be, nginx]
- cp3006.esams.wmnet: [varnish-fe, varnish-be, nginx]
- cp3007.esams.wmnet: [varnish-fe, varnish-be, nginx]
- cp3008.esams.wmnet: [varnish-fe, varnish-be, nginx]
- cp3009.esams.wmnet: [varnish-fe, varnish-be, nginx]
- cp3010.esams.wmnet: [varnish-fe, varnish-be, nginx]
- cp3012.esams.wmnet: [varnish-fe, varnish-be, nginx]
- cp3013.esams.wmnet: [varnish-fe, varnish-be, nginx]
- cp3014.esams.wmnet: [varnish-fe, varnish-be, nginx]
- cp3030.esams.wmnet: [varnish-fe, varnish-be, nginx]
- cp3031.esams.wmnet: [varnish-fe, varnish-be, nginx]
- cp3040.esams.wmnet: [varnish-fe, varnish-be, nginx]
- cp3041.esams.wmnet: [varnish-fe, varnish-be, nginx]
+ cp3003.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp3004.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp3005.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp3006.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp3007.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp3008.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp3009.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp3010.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp3012.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp3013.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp3014.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp3030.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp3031.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp3040.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp3041.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
cache_upload:
cp3032.esams.wmnet: [varnish-fe, varnish-be, nginx]
cp3033.esams.wmnet: [varnish-fe, varnish-be, nginx]
diff --git a/conftool-data/nodes/ulsfo.yaml b/conftool-data/nodes/ulsfo.yaml
index 9b6cb43..f15fbfd 100644
--- a/conftool-data/nodes/ulsfo.yaml
+++ b/conftool-data/nodes/ulsfo.yaml
@@ -9,12 +9,12 @@
cp4019.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
cp4020.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
cache_text:
- cp4008.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
- cp4009.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
- cp4010.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
- cp4016.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
- cp4017.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
- cp4018.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
+ cp4008.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp4009.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp4010.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp4016.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp4017.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp4018.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
cache_upload:
cp4005.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
cp4006.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
diff --git a/conftool-data/services/cache.yaml
b/conftool-data/services/cache.yaml
index bd8dc0c..3a81f9a 100644
--- a/conftool-data/services/cache.yaml
+++ b/conftool-data/services/cache.yaml
@@ -19,6 +19,16 @@
- eqiad
- esams
- ulsfo
+ varnish-be-rand:
+ port: 3128
+ default_values:
+ "pooled": "yes"
+ "weight": 10
+ datacenters:
+ - codfw
+ - eqiad
+ - esams
+ - ulsfo
nginx:
port: 443
default_values:
--
To view, visit https://gerrit.wikimedia.org/r/221071
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I07405b5310381d66561b7fedf17e304849abc485
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[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
