BBlack has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/350505 )
Change subject: Decom legacy citoid service hostname
......................................................................
Decom legacy citoid service hostname
Announced on 8 March with a 1 May deadline.
Bug: T133001
Change-Id: I72d0db5d53a3f0ab436cc7ff080daba9256bd194
---
M hieradata/hosts/cp1008.yaml
M hieradata/role/common/cache/text.yaml
M modules/varnish/templates/text-common.inc.vcl.erb
3 files changed, 1 insertion(+), 15 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
Objections:
Mobrovac: There's a problem with this change, please improve
diff --git a/hieradata/hosts/cp1008.yaml b/hieradata/hosts/cp1008.yaml
index 199fc3d..4b128a5 100644
--- a/hieradata/hosts/cp1008.yaml
+++ b/hieradata/hosts/cp1008.yaml
@@ -37,8 +37,3 @@
port: 8080
backends:
eqiad: 'cxserver.svc.eqiad.wmnet'
- citoid_backend:
- be_opts:
- port: 1970
- backends:
- eqiad: 'citoid.svc.eqiad.wmnet'
diff --git a/hieradata/role/common/cache/text.yaml
b/hieradata/role/common/cache/text.yaml
index 9526e9e..e325c86 100644
--- a/hieradata/role/common/cache/text.yaml
+++ b/hieradata/role/common/cache/text.yaml
@@ -56,18 +56,9 @@
backends:
# eqiad: 'cxserver.svc.eqiad.wmnet'
codfw: 'cxserver.svc.codfw.wmnet'
- citoid_backend:
- be_opts:
- port: 1970
- backends:
- # eqiad: 'citoid.svc.eqiad.wmnet'
- codfw: 'citoid.svc.codfw.wmnet'
cache::req_handling:
cxserver.wikimedia.org:
director: 'cxserver_backend'
- caching: 'pass'
- citoid.wikimedia.org:
- director: 'citoid_backend'
caching: 'pass'
default:
director: 'appservers'
diff --git a/modules/varnish/templates/text-common.inc.vcl.erb
b/modules/varnish/templates/text-common.inc.vcl.erb
index d21afda..64614cf 100644
--- a/modules/varnish/templates/text-common.inc.vcl.erb
+++ b/modules/varnish/templates/text-common.inc.vcl.erb
@@ -63,7 +63,7 @@
sub text_normalize_path {
// Don't decode percent-encoded slashes in paths for REST APIs
- if (req.url ~ "^/api/rest_v1/" || req.http.host ~
"^(cxserver|citoid)\.wikimedia\.org$") {
+ if (req.url ~ "^/api/rest_v1/" || req.http.host ~
"^cxserver\.wikimedia\.org$") {
call normalize_rest_path;
} else {
call normalize_mediawiki_path;
--
To view, visit https://gerrit.wikimedia.org/r/350505
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I72d0db5d53a3f0ab436cc7ff080daba9256bd194
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
