Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: lvs: add parsoid configuration in codfw
......................................................................
lvs: add parsoid configuration in codfw
Bug: T129090
Change-Id: Idddaef81392be7a222d1affe8d15a40d6510ee0b
---
M hieradata/common/lvs/configuration.yaml
M hieradata/role/codfw/parsoid/production.yaml
M hieradata/role/common/parsoid/production.yaml
M hieradata/role/eqiad/parsoid/production.yaml
4 files changed, 9 insertions(+), 3 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
Alexandros Kosiaris: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/hieradata/common/lvs/configuration.yaml
b/hieradata/common/lvs/configuration.yaml
index 394a9ca..4d57297 100644
--- a/hieradata/common/lvs/configuration.yaml
+++ b/hieradata/common/lvs/configuration.yaml
@@ -96,6 +96,7 @@
eqiad: 10.2.2.31
parsoid: &ip_block011
eqiad: 10.2.2.28
+ codfw: 10.2.1.28
mathoid: &ip_block016
eqiad: 10.2.2.20
citoid: &ip_block017
@@ -470,10 +471,11 @@
eqiad:
hostname: ms-fe.eqiad.wmnet
parsoid:
- description: Parsoid wikitext parser for VisualEditor
+ description: "Parsoid wikitext parser for VisualEditor (%{::site})"
class: low-traffic
sites:
- eqiad
+ - codfw
ip: *ip_block011
port: 8000
bgp: 'yes'
@@ -494,6 +496,8 @@
sites:
eqiad:
hostname: parsoid.svc.eqiad.wmnet
+ codfw:
+ hostname: parsoid.svc.codfw.wmnet
search:
description: Elasticsearch search for MediaWiki
class: low-traffic
diff --git a/hieradata/role/codfw/parsoid/production.yaml
b/hieradata/role/codfw/parsoid/production.yaml
index 253b892..2073f23 100644
--- a/hieradata/role/codfw/parsoid/production.yaml
+++ b/hieradata/role/codfw/parsoid/production.yaml
@@ -1,3 +1,5 @@
debdeploy::grains:
debdeploy-parsoid-codfw:
value: standard
+lvs::realserver::realserver_ips:
+ - 10.2.1.28
diff --git a/hieradata/role/common/parsoid/production.yaml
b/hieradata/role/common/parsoid/production.yaml
index 08c934b..7138624 100644
--- a/hieradata/role/common/parsoid/production.yaml
+++ b/hieradata/role/common/parsoid/production.yaml
@@ -2,5 +2,3 @@
- parsoid-roots
- parsoid-admin
cluster: parsoid
-lvs::realserver::realserver_ips:
- - 10.2.2.28
diff --git a/hieradata/role/eqiad/parsoid/production.yaml
b/hieradata/role/eqiad/parsoid/production.yaml
index 504300a..6f3fb72 100644
--- a/hieradata/role/eqiad/parsoid/production.yaml
+++ b/hieradata/role/eqiad/parsoid/production.yaml
@@ -1,3 +1,5 @@
debdeploy::grains:
debdeploy-parsoid-eqiad:
value: standard
+lvs::realserver::realserver_ips:
+ - 10.2.2.28
--
To view, visit https://gerrit.wikimedia.org/r/275530
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idddaef81392be7a222d1affe8d15a40d6510ee0b
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[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
