BBlack has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339667 )
Change subject: varnish: move "apps" data back into manifests [WIP, 1/4]
......................................................................
varnish: move "apps" data back into manifests [WIP, 1/4]
This seems like a regression. It takes applayer datacenter
routing and moves it from an explicit route in hieradata to an
implicit one in a manifest. However, it's just the next sane step
in aligning with cache_misc before moving all related data (not
just hostnames and routes, but all of "app_directors") back into
hieradata with proper per-application routing.
It also temporarily breaks beta, which uses the same hieradata (in
labs.yaml), but we'll fix that when it all moves back...
Bug: T134404
Change-Id: Ia29f6a41914bdc6b7e998cd8b5f5b073ff8eb461
---
M hieradata/common/cache/maps.yaml
M hieradata/common/cache/text.yaml
M hieradata/common/cache/upload.yaml
M modules/role/manifests/cache/maps.pp
M modules/role/manifests/cache/text.pp
M modules/role/manifests/cache/upload.pp
6 files changed, 16 insertions(+), 74 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/67/339667/1
diff --git a/hieradata/common/cache/maps.yaml b/hieradata/common/cache/maps.yaml
index 9e7869b..0cb44c0 100644
--- a/hieradata/common/cache/maps.yaml
+++ b/hieradata/common/cache/maps.yaml
@@ -19,9 +19,3 @@
- 'cp4012.ulsfo.wmnet'
- 'cp4019.ulsfo.wmnet'
- 'cp4020.ulsfo.wmnet'
-cache::maps::apps:
- kartotherian:
- route: 'eqiad'
- backends:
- codfw: 'kartotherian.svc.codfw.wmnet'
- eqiad: 'kartotherian.svc.eqiad.wmnet'
diff --git a/hieradata/common/cache/text.yaml b/hieradata/common/cache/text.yaml
index 52c4506..0f727b3 100644
--- a/hieradata/common/cache/text.yaml
+++ b/hieradata/common/cache/text.yaml
@@ -33,44 +33,3 @@
- 'cp4016.ulsfo.wmnet'
- 'cp4017.ulsfo.wmnet'
- 'cp4018.ulsfo.wmnet'
-cache::text::apps:
- appservers:
- route: 'eqiad'
- backends:
- eqiad: 'appservers.svc.eqiad.wmnet'
- codfw: 'appservers.svc.codfw.wmnet'
- appservers_debug:
- route: 'codfw'
- backends:
- eqiad: 'hassium.eqiad.wmnet'
- codfw: 'hassaleh.codfw.wmnet'
- api:
- route: 'eqiad'
- backends:
- eqiad: 'api.svc.eqiad.wmnet'
- codfw: 'api.svc.codfw.wmnet'
- rendering:
- route: 'eqiad'
- backends:
- eqiad: 'rendering.svc.eqiad.wmnet'
- codfw: 'rendering.svc.codfw.wmnet'
- restbase:
- route: 'eqiad'
- backends:
- eqiad: 'restbase.svc.eqiad.wmnet'
- codfw: 'restbase.svc.codfw.wmnet'
- cxserver:
- route: 'eqiad'
- backends:
- eqiad: 'cxserver.svc.eqiad.wmnet'
- codfw: 'cxserver.svc.codfw.wmnet'
- citoid:
- route: 'eqiad'
- backends:
- eqiad: 'citoid.svc.eqiad.wmnet'
- codfw: 'citoid.svc.codfw.wmnet'
- security_audit:
- route: 'eqiad'
- backends:
- eqiad: 'appservers.svc.eqiad.wmnet'
- codfw: 'appservers.svc.codfw.wmnet'
diff --git a/hieradata/common/cache/upload.yaml
b/hieradata/common/cache/upload.yaml
index 85d02a4..5c7838c 100644
--- a/hieradata/common/cache/upload.yaml
+++ b/hieradata/common/cache/upload.yaml
@@ -42,14 +42,3 @@
- 'cp4013.ulsfo.wmnet'
- 'cp4014.ulsfo.wmnet'
- 'cp4015.ulsfo.wmnet'
-cache::upload::apps:
- swift:
- route: 'eqiad'
- backends:
- eqiad: 'ms-fe.svc.eqiad.wmnet'
- codfw: 'ms-fe.svc.codfw.wmnet'
- swift_thumbs:
- route: 'eqiad'
- backends:
- eqiad: 'ms-fe-thumbs.svc.eqiad.wmnet'
- codfw: 'ms-fe-thumbs.svc.codfw.wmnet'
diff --git a/modules/role/manifests/cache/maps.pp
b/modules/role/manifests/cache/maps.pp
index 881c75c..247fd1b 100644
--- a/modules/role/manifests/cache/maps.pp
+++ b/modules/role/manifests/cache/maps.pp
@@ -39,7 +39,7 @@
$apps = hiera('cache::maps::apps')
$app_directors = {
'kartotherian' => {
- 'backend' =>
$apps['kartotherian']['backends'][$apps['kartotherian']['route']],
+ 'backend' => 'kartotherian.svc.eqiad.wmnet',
},
}
diff --git a/modules/role/manifests/cache/text.pp
b/modules/role/manifests/cache/text.pp
index fae2b4f..4303d79 100644
--- a/modules/role/manifests/cache/text.pp
+++ b/modules/role/manifests/cache/text.pp
@@ -44,35 +44,35 @@
'max_connections' => 1000,
}
- $apps = hiera('cache::text::apps')
$app_directors = {
'appservers' => {
- 'backend' =>
$apps['appservers']['backends'][$apps['appservers']['route']],
+ 'backend' => 'appservers.svc.eqiad.wmnet',
},
'api' => {
- 'backend' => $apps['api']['backends'][$apps['api']['route']],
+ 'backend' => 'api.svc.eqiad.wmnet',
},
'rendering' => {
- 'backend' =>
$apps['rendering']['backends'][$apps['rendering']['route']],
+ 'backend' => 'rendering.svc.eqiad.wmnet',
},
'security_audit' => {
- 'backend' =>
$apps['security_audit']['backends'][$apps['security_audit']['route']],
+ 'backend' => 'appservers.svc.eqiad.wmnet',
},
'appservers_debug' => {
- 'backend' =>
$apps['appservers_debug']['backends'][$apps['appservers_debug']['route']],
- 'be_opts' => { 'max_connections' => 20 },
+ # 'backend' => 'hassium.eqiad.wmnet',
+ 'backend' => 'hassaleh.codfw.wmnet',
+ 'be_opts' => { 'max_connections' => 20 },
},
'restbase_backend' => {
- 'backend' =>
$apps['restbase']['backends'][$apps['restbase']['route']],
- 'be_opts' => { 'port' => 7231, 'max_connections' => 5000 },
+ 'backend' => 'restbase.svc.eqiad.wmnet',
+ 'be_opts' => { 'port' => 7231, 'max_connections' => 5000 },
},
'cxserver_backend' => { # LEGACY: should be removed eventually
- 'backend' =>
$apps['cxserver']['backends'][$apps['cxserver']['route']],
- 'be_opts' => { 'port' => 8080 },
+ 'backend' => 'cxserver.svc.eqiad.wmnet',
+ 'be_opts' => { 'port' => 8080 },
},
'citoid_backend' => { # LEGACY: should be removed eventually
- 'backend' => $apps['citoid']['backends'][$apps['citoid']['route']],
- 'be_opts' => { 'port' => 1970 },
+ 'backend' => 'citoid.svc.eqiad.wmnet',
+ 'be_opts' => { 'port' => 1970 },
},
}
diff --git a/modules/role/manifests/cache/upload.pp
b/modules/role/manifests/cache/upload.pp
index e68e128..482f5b4 100644
--- a/modules/role/manifests/cache/upload.pp
+++ b/modules/role/manifests/cache/upload.pp
@@ -43,10 +43,10 @@
$apps = hiera('cache::upload::apps')
$app_directors = {
'swift' => {
- 'backend' => $apps['swift']['backends'][$apps['swift']['route']],
+ 'backend' => 'ms-fe.svc.eqiad.wmnet',
},
'swift_thumbs' => {
- 'backend' =>
$apps['swift_thumbs']['backends'][$apps['swift_thumbs']['route']],
+ 'backend' => 'ms-fe-thumbs.svc.eqiad.wmnet',
},
}
--
To view, visit https://gerrit.wikimedia.org/r/339667
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia29f6a41914bdc6b7e998cd8b5f5b073ff8eb461
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
