BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268227
Change subject: cache_mobile LVS decom: 2/2 remove conftool data
......................................................................
cache_mobile LVS decom: 2/2 remove conftool data
Bug: T109286
Change-Id: I6161e425942c575a9aa6b91666160c8613157b5e
---
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, 0 insertions(+), 99 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/27/268227/1
diff --git a/conftool-data/nodes/codfw.yaml b/conftool-data/nodes/codfw.yaml
index 9c51213..8758cf0 100644
--- a/conftool-data/nodes/codfw.yaml
+++ b/conftool-data/nodes/codfw.yaml
@@ -203,19 +203,6 @@
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-be, varnish-be-rand]
- cp2009.codfw.wmnet: [varnish-be, varnish-be-rand]
- cp2015.codfw.wmnet: [varnish-be, varnish-be-rand]
- cp2021.codfw.wmnet: [varnish-be, varnish-be-rand]
- cp2001.codfw.wmnet: [varnish-fe, nginx]
- cp2004.codfw.wmnet: [varnish-fe, nginx]
- cp2007.codfw.wmnet: [varnish-fe, nginx]
- cp2010.codfw.wmnet: [varnish-fe, nginx]
- cp2013.codfw.wmnet: [varnish-fe, nginx]
- cp2016.codfw.wmnet: [varnish-fe, nginx]
- cp2019.codfw.wmnet: [varnish-fe, nginx]
- cp2023.codfw.wmnet: [varnish-fe, nginx]
cache_upload:
cp2002.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
cp2005.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
diff --git a/conftool-data/nodes/eqiad.yaml b/conftool-data/nodes/eqiad.yaml
index e5f79df..ed81507 100644
--- a/conftool-data/nodes/eqiad.yaml
+++ b/conftool-data/nodes/eqiad.yaml
@@ -229,19 +229,6 @@
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-be, varnish-be-rand]
- cp1047.eqiad.wmnet: [varnish-be, varnish-be-rand]
- cp1059.eqiad.wmnet: [varnish-be, varnish-be-rand]
- cp1060.eqiad.wmnet: [varnish-be, varnish-be-rand]
- cp1052.eqiad.wmnet: [varnish-fe, nginx]
- cp1053.eqiad.wmnet: [varnish-fe, nginx]
- cp1054.eqiad.wmnet: [varnish-fe, nginx]
- cp1055.eqiad.wmnet: [varnish-fe, nginx]
- cp1065.eqiad.wmnet: [varnish-fe, nginx]
- cp1066.eqiad.wmnet: [varnish-fe, nginx]
- cp1067.eqiad.wmnet: [varnish-fe, nginx]
- cp1068.eqiad.wmnet: [varnish-fe, nginx]
cache_upload:
cp1048.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
cp1049.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
diff --git a/conftool-data/nodes/esams.yaml b/conftool-data/nodes/esams.yaml
index 931597d6..9396b90 100644
--- a/conftool-data/nodes/esams.yaml
+++ b/conftool-data/nodes/esams.yaml
@@ -1,24 +1,3 @@
-cache_mobile:
- cp3015.esams.wmnet: [varnish-be, varnish-be-rand]
- cp3016.esams.wmnet: [varnish-be, varnish-be-rand]
- cp3017.esams.wmnet: [varnish-be, varnish-be-rand]
- cp3018.esams.wmnet: [varnish-be, varnish-be-rand]
- cp3003.esams.wmnet: [varnish-fe, nginx]
- cp3004.esams.wmnet: [varnish-fe, nginx]
- cp3005.esams.wmnet: [varnish-fe, nginx]
- cp3006.esams.wmnet: [varnish-fe, nginx]
- cp3007.esams.wmnet: [varnish-fe, nginx]
- cp3008.esams.wmnet: [varnish-fe, nginx]
- cp3009.esams.wmnet: [varnish-fe, nginx]
- cp3010.esams.wmnet: [varnish-fe, nginx]
-# cp3011.esams.wmnet: [varnish-fe, nginx] #disabled, see T92306
- cp3012.esams.wmnet: [varnish-fe, nginx]
- cp3013.esams.wmnet: [varnish-fe, nginx]
- cp3014.esams.wmnet: [varnish-fe, nginx]
- cp3030.esams.wmnet: [varnish-fe, nginx]
- cp3031.esams.wmnet: [varnish-fe, nginx]
- cp3040.esams.wmnet: [varnish-fe, nginx]
- cp3041.esams.wmnet: [varnish-fe, nginx]
cache_text:
cp3003.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
cp3004.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
diff --git a/conftool-data/nodes/ulsfo.yaml b/conftool-data/nodes/ulsfo.yaml
index ada72ca..e190412 100644
--- a/conftool-data/nodes/ulsfo.yaml
+++ b/conftool-data/nodes/ulsfo.yaml
@@ -1,14 +1,3 @@
-cache_mobile:
- cp4011.ulsfo.wmnet: [varnish-be, varnish-be-rand]
- cp4012.ulsfo.wmnet: [varnish-be, varnish-be-rand]
- cp4019.ulsfo.wmnet: [varnish-be, varnish-be-rand]
- cp4020.ulsfo.wmnet: [varnish-be, varnish-be-rand]
- cp4008.ulsfo.wmnet: [varnish-fe, nginx]
- cp4009.ulsfo.wmnet: [varnish-fe, nginx]
- cp4010.ulsfo.wmnet: [varnish-fe, nginx]
- cp4016.ulsfo.wmnet: [varnish-fe, nginx]
- cp4017.ulsfo.wmnet: [varnish-fe, nginx]
- cp4018.ulsfo.wmnet: [varnish-fe, nginx]
cache_text:
cp4008.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
cp4009.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 dfa6b7e..7e5d456 100644
--- a/conftool-data/services/cache.yaml
+++ b/conftool-data/services/cache.yaml
@@ -39,47 +39,6 @@
- eqiad
- esams
- ulsfo
-cache_mobile:
- varnish-fe:
- port: 80
- default_values:
- "pooled": "no"
- "weight": 1
- datacenters:
- - codfw
- - eqiad
- - esams
- - ulsfo
- varnish-be:
- port: 3128
- default_values:
- "pooled": "no"
- "weight": 100
- datacenters:
- - codfw
- - eqiad
- - esams
- - ulsfo
- varnish-be-rand:
- port: 3128
- default_values:
- "pooled": "no"
- "weight": 10
- datacenters:
- - codfw
- - eqiad
- - esams
- - ulsfo
- nginx:
- port: 443
- default_values:
- "pooled": "no"
- "weight": 1
- datacenters:
- - codfw
- - eqiad
- - esams
- - ulsfo
cache_upload:
varnish-fe:
port: 80
--
To view, visit https://gerrit.wikimedia.org/r/268227
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6161e425942c575a9aa6b91666160c8613157b5e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
