Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340993 )
Change subject: realm: remove parsoid_site, switch to discovery.
......................................................................
realm: remove parsoid_site, switch to discovery.
Change-Id: Ia085c2e43c0241fcf66268509ec735ce16cb71a6
---
M hieradata/common/discovery.yaml
M hieradata/role/common/restbase/server.yaml
M manifests/realm.pp
3 files changed, 1 insertion(+), 3 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/common/discovery.yaml b/hieradata/common/discovery.yaml
index 76a427f..d497d79 100644
--- a/hieradata/common/discovery.yaml
+++ b/hieradata/common/discovery.yaml
@@ -3,7 +3,6 @@
# while other services should be polled locally
discovery::app_routes:
mediawiki: 'eqiad'
- parsoid: "%{::site}"
restbase: "%{::site}"
mobileapps: "%{::site}"
mathoid: "%{::site}"
diff --git a/hieradata/role/common/restbase/server.yaml
b/hieradata/role/common/restbase/server.yaml
index 359795f..8e67065 100644
--- a/hieradata/role/common/restbase/server.yaml
+++ b/hieradata/role/common/restbase/server.yaml
@@ -10,7 +10,7 @@
- "eqiad"
- "codfw"
restbase::statsd_host: statsd.eqiad.wmnet
-restbase::parsoid_uri: "http://parsoid.svc.%{::parsoid_site}.wmnet:8000";
+restbase::parsoid_uri: "http://parsoid.discovery.wmnet:8000";
restbase::graphoid_uri: "http://graphoid.discovery.wmnet:19000";
restbase::mobileapps_uri: "http://mobileapps.svc.%{::mbapps_site}.wmnet:8888";
restbase::mathoid_uri: "http://mathoid.svc.%{::mathoid_site}.wmnet:10042";
diff --git a/manifests/realm.pp b/manifests/realm.pp
index ed86708..7915bcf 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -72,7 +72,6 @@
# Shortcut variables to use e.g. in hiera
$mw_primary = $app_routes['mediawiki']
-$parsoid_site = $app_routes['parsoid']
$rb_site = $app_routes['restbase']
$mbapps_site = $app_routes['mobileapps']
$mathoid_site = $app_routes['mathoid']
--
To view, visit https://gerrit.wikimedia.org/r/340993
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia085c2e43c0241fcf66268509ec735ce16cb71a6
Gerrit-PatchSet: 4
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
