Mobrovac has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196229
Change subject: Hit Parsoid directly
......................................................................
Hit Parsoid directly
Until now we have been calling Parsoid by passing through Varnish.
However, given that we use exclusively Parsoid's v2, which isn't cached
at all, it's better to hit the LVS directly.
Change-Id: Idce3d86ee6a9de1d029058e020467f9edf178f98
---
M hieradata/role/common/restbase.yaml
M modules/restbase/manifests/init.pp
M modules/restbase/templates/config.yaml.erb
3 files changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/29/196229/1
diff --git a/hieradata/role/common/restbase.yaml
b/hieradata/role/common/restbase.yaml
index 0cb2926..a9dca47 100644
--- a/hieradata/role/common/restbase.yaml
+++ b/hieradata/role/common/restbase.yaml
@@ -23,6 +23,7 @@
restbase::cassandra_defaultConsistency: localQuorum
restbase::cassandra_localDc: "%{::site}"
restbase::statsd_host: statsd.eqiad.wmnet
+restbase::parsoid_uri: http://10.2.2.28:8000 # parsoid.svc.eqiad.wmnet
lvs::realserver::realserver_ips:
- '10.2.2.17' # restbase.svc.eqiad.wmnet
diff --git a/modules/restbase/manifests/init.pp
b/modules/restbase/manifests/init.pp
index 456b430..86be047 100644
--- a/modules/restbase/manifests/init.pp
+++ b/modules/restbase/manifests/init.pp
@@ -19,6 +19,8 @@
# Which DC should be considered local. Default: 'datacenter1'.
# [*port*]
# Port where to run the restbase service. Default: 7231
+# [*parsoid_uri*]
+# URI to reach Parsoid. Default: http://parsoid-lb.eqiad.wikimedia.org
# [*logstash_host*]
# GELF logging host. Default: localhost
# [*logstash_port*]
@@ -38,6 +40,7 @@
$cassandra_defaultConsistency = 'localQuorum',
$cassandra_localDc = 'datacenter1',
$port = 7231,
+ $parsoid_uri = 'http://parsoid-lb.eqiad.wikimedia.org',
$logstash_host = 'localhost',
$logstash_port = 12201,
$logging_level = 'warn',
diff --git a/modules/restbase/templates/config.yaml.erb
b/modules/restbase/templates/config.yaml.erb
index 9892e5f..8298e72 100644
--- a/modules/restbase/templates/config.yaml.erb
+++ b/modules/restbase/templates/config.yaml.erb
@@ -115,7 +115,7 @@
version: 1.0.0
type: file
options:
- parsoidHost: http://parsoid-lb.eqiad.wikimedia.org
+ parsoidHost: <%= @parsoid_uri %>
/{module:action}:
x-modules:
--
To view, visit https://gerrit.wikimedia.org/r/196229
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idce3d86ee6a9de1d029058e020467f9edf178f98
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac <mobro...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
